cargo update

.circleci/config.yml

@@ -10,7 +10,7 @@ executors:
         type: boolean
         default: false
     docker:
-    - image: plumeorg/plume-buildenv:v0.0.9
+    - image: plumeorg/plume-buildenv:v0.0.7
     - image: <<#parameters.postgres>>circleci/postgres:9.6-alpine<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
       environment:
         POSTGRES_USER: postgres
@@ -19,7 +19,7 @@ executors:
     working_directory: ~/projects/Plume
     environment:
       RUST_TEST_THREADS: 1
-      FEATURES: <<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>,ci
+      FEATURES: <<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>
       DATABASE_URL: <<#parameters.postgres>>postgres://postgres@localhost/plume<</parameters.postgres>><<^parameters.postgres>>plume.sqlite<</parameters.postgres>>
 
 
@@ -82,7 +82,7 @@ commands:
         type: string
     steps:
     - run: zip -0 ccov.zip `find . -name 'plume*.gc*' -o -name 'plm*.gc*'`
-    - run: grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore '/*' -o lcov.info
+    - run: grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore-dir '/*' -o lcov.info
     - run: bash <(curl -s https://codecov.io/bash) -f lcov.info -F <<parameters.type>>
     - run: find . -name 'plume*.gc*' -delete -o -name 'plm*.gc*' -delete
     - run: rm ccov.zip lcov.info

.circleci/images/plume-buildenv/Dockerfile

@@ -4,11 +4,11 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 #install native/circleci/build dependancies
 RUN apt update &&\
     apt install -y --no-install-recommends git ssh tar gzip ca-certificates default-jre&&\
-    apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-pip zip unzip libclang-dev&&\
+    apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-pip zip unzip &&\
     rm -rf /var/lib/apt/lists/*
 
 #install and configure rust
-RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-01-15 -y &&\
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-03-23 -y &&\
     rustup component add rustfmt clippy &&\
     rustup component add rust-std --target wasm32-unknown-unknown
 

Cargo.toml

@@ -1,9 +1,8 @@
 [package]
 authors = ["Plume contributors"]
 name = "plume"
-version = "0.4.0"
+version = "0.3.0"
 repository = "https://github.com/Plume-org/Plume"
-edition = "2018"
 
 [dependencies]
 activitypub = "0.1.3"
@@ -20,8 +19,8 @@ heck = "0.3.0"
 lettre = "0.9.2"
 lettre_email = "0.9.2"
 num_cpus = "1.10"
-rocket = "0.4.2"
+rocket = "0.4.0"
-rocket_contrib = { version = "0.4.2", features = ["json"] }
+rocket_contrib = { version = "0.4.0", features = ["json"] }
 rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
 rpassword = "4.0"
 runtime-fmt = "0.4.0"
@@ -30,7 +29,6 @@ serde = "1.0"
 serde_json = "1.0"
 serde_qs = "0.5"
 shrinkwraprs = "0.2.1"
-syntect = "3.3"
 validator = "0.8"
 validator_derive = "0.8"
 webfinger = "0.4.1"
@@ -70,7 +68,7 @@ git = "https://github.com/fdb-hiroshima/rocket_csrf"
 rev = "29910f2829e7e590a540da3804336577b48c7b31"
 
 [build-dependencies]
-ructe = "0.9.0"
+ructe = "0.6.2"
 rsass = "0.9"
 
 [features]
@@ -79,7 +77,6 @@ postgres = ["plume-models/postgres", "diesel/postgres"]
 sqlite = ["plume-models/sqlite", "diesel/sqlite"]
 debug-mailer = []
 test = []
-ci = ["plume-models/ci", "plume-api/ci", "plume-common/ci"]
 
 [workspace]
 members = ["plume-api", "plume-cli", "plume-models", "plume-common", "plume-front", "plume-macro"]

Dockerfile

@@ -10,8 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     gcc \
     make \
     openssl \
-    libssl-dev \
+    libssl-dev
-    clang
 
 WORKDIR /scratch
 COPY script/wasm-deps.sh .

assets/themes/default/_dark_variables.scss

@@ -17,12 +17,3 @@ $text-color: $white;
 $primary: $purple;
 $primary-text-color: $white; // text color on primary background (buttons for instance)
 $success-color: $blue;
-
-//Code Highlighting
-
-$code-keyword-color: #f79ac1;
-$code-source-color: #a6f0ab;
-$code-constant-color: #dfec84;
-$code-operator-color: #eddf95;
-$code-string-color: #f2ae60;
-$code-comment-color: #a3b4f9;

assets/themes/default/_global.scss

@@ -623,28 +623,3 @@ figure {
     }
   }
 }
-
-//highlighting
-code {
-  .constant{
-      color: $code-constant-color;
-  }
-  .string{
-      color: $code-string-color;
-  }
-  .keyword.type,.keyword.control,.type{
-      color: $code-keyword-color;
-  }
-  .keyword.operator{
-      color: $code-operator-color;
-  }
-  .source{
-      color: $code-source-color;
-  }
-  .comment{
-      color: $code-comment-color;
-  }
-  .function{
-      color:inherit;
-  }
-}

assets/themes/default/_variables.scss

@@ -27,11 +27,3 @@ $margin: 0 $horizontal-margin;
 $route159: "Route159", serif;
 $playfair: "Playfair Display", serif;
 $lora: "Lora", serif;
-
-//Code Highlighting
-$code-keyword-color: #45244a;
-$code-source-color: #4c588c;
-$code-constant-color: scale-color(magenta,$lightness:-5%);
-$code-operator-color: scale-color($code-source-color,$lightness:-5%);
-$code-string-color: #8a571c;
-$code-comment-color: #1c4c8a;

build.rs

@@ -1,5 +1,5 @@
-use rsass;
+extern crate rsass;
-
+extern crate ructe;
 use ructe::Ructe;
 use std::process::{Command, Stdio};
 use std::{ffi::OsStr, fs::*, io::Write, path::*};

migrations/postgres/2020-01-05-232816_add_blocklist/down.sql

@@ -1,3 +0,0 @@
--- This file should undo anything in `up.sql`
-
-drop table email_blocklist;

migrations/postgres/2020-01-05-232816_add_blocklist/up.sql

@@ -1,6 +0,0 @@
--- Your SQL goes here
-CREATE TABLE email_blocklist(id SERIAL PRIMARY KEY,
-                             email_address TEXT UNIQUE,
-                             note TEXT,
-                             notify_user BOOLEAN DEFAULT FALSE,
-                             notification_text TEXT);

migrations/sqlite/2020-01-05-232816_add_blocklist/down.sql

@@ -1,3 +0,0 @@
--- This file should undo anything in `up.sql`
-
-drop table email_blocklist;

migrations/sqlite/2020-01-05-232816_add_blocklist/up.sql

@@ -1,6 +0,0 @@
--- Your SQL goes here
-CREATE TABLE email_blocklist(id INTEGER PRIMARY KEY,
-                             email_address TEXT UNIQUE,
-                             note TEXT,
-                             notify_user BOOLEAN DEFAULT FALSE,
-                             notification_text TEXT);

plume-api/Cargo.toml

@@ -1,12 +1,8 @@
 [package]
 name = "plume-api"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 serde = "1.0"
 serde_derive = "1.0"
-
-[features]
-ci = []

plume-api/src/lib.rs

@@ -1,5 +1,4 @@
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
+extern crate serde;
-
 #[macro_use]
 extern crate serde_derive;
 

plume-cli/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-cli"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [[bin]]
 name = "plm"
@@ -23,4 +22,3 @@ path = "../plume-models"
 [features]
 postgres = ["plume-models/postgres", "diesel/postgres"]
 sqlite = ["plume-models/sqlite", "diesel/sqlite"]
-ci = ["plume-models/ci"]

plume-cli/src/main.rs

@@ -1,8 +1,11 @@
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
+extern crate clap;
+extern crate diesel;
+extern crate dotenv;
+extern crate plume_models;
+extern crate rpassword;
 
 use clap::App;
 use diesel::Connection;
-use dotenv;
 use plume_models::{instance::Instance, Connection as Conn, CONFIG};
 use std::io::{self, prelude::*};
 

plume-common/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-common"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 activitypub = "0.1.1"
@@ -20,7 +19,6 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 shrinkwraprs = "0.2.1"
-syntect = "3.3"
 tokio = "0.1.22"
 
 [dependencies.chrono]
@@ -30,6 +28,3 @@ version = "0.4"
 [dependencies.pulldown-cmark]
 default-features = false
 version = "0.2.0"
-
-[features]
-ci = []

plume-common/src/activity_pub/mod.rs

@@ -64,7 +64,7 @@ impl<T> ActivityStream<T> {
 }
 
 impl<'r, O: Object> Responder<'r> for ActivityStream<O> {
-    fn respond_to(self, request: &Request<'_>) -> Result<Response<'r>, Status> {
+    fn respond_to(self, request: &Request) -> Result<Response<'r>, Status> {
         let mut json = serde_json::to_value(&self.0).map_err(|_| Status::InternalServerError)?;
         json["@context"] = context();
         serde_json::to_string(&json).respond_to(request).map(|r| {

plume-common/src/activity_pub/request.rs

@@ -5,8 +5,8 @@ use reqwest::header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE, DATE, USER_A
 use std::ops::Deref;
 use std::time::SystemTime;
 
-use crate::activity_pub::sign::Signer;
+use activity_pub::sign::Signer;
-use crate::activity_pub::{ap_accept_header, AP_CONTENT_TYPE};
+use activity_pub::{ap_accept_header, AP_CONTENT_TYPE};
 
 const PLUME_USER_AGENT: &str = concat!("Plume/", env!("CARGO_PKG_VERSION"));
 

plume-common/src/activity_pub/sign.rs

@@ -131,7 +131,7 @@ impl SignatureValidity {
 
 pub fn verify_http_headers<S: Signer + ::std::fmt::Debug>(
     sender: &S,
-    all_headers: &HeaderMap<'_>,
+    all_headers: &HeaderMap,
     data: &request::Digest,
 ) -> SignatureValidity {
     let sig_header = all_headers.get_one("Signature");

plume-common/src/lib.rs

@@ -1,17 +1,26 @@
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
 #![feature(associated_type_defaults)]
 
+extern crate activitypub;
 #[macro_use]
 extern crate activitystreams_derive;
-use activitystreams_traits;
+extern crate activitystreams_traits;
-
+extern crate array_tool;
-use serde;
+extern crate base64;
+extern crate chrono;
+extern crate heck;
+extern crate hex;
+extern crate openssl;
+extern crate pulldown_cmark;
+extern crate reqwest;
+extern crate rocket;
+extern crate serde;
 #[macro_use]
 extern crate shrinkwraprs;
 #[macro_use]
 extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
+extern crate tokio;
 
 pub mod activity_pub;
 pub mod utils;

plume-common/src/utils.rs

@@ -7,8 +7,6 @@ use rocket::{
 };
 use std::borrow::Cow;
 use std::collections::HashSet;
-use syntect::html::ClassedHTMLGenerator;
-use syntect::parsing::SyntaxSet;
 
 /// Generates an hexadecimal representation of 32 bytes of random data
 pub fn random_hex() -> String {
@@ -48,7 +46,7 @@ enum State {
     Ready,
 }
 
-fn to_inline(tag: Tag<'_>) -> Tag<'_> {
+fn to_inline(tag: Tag) -> Tag {
     match tag {
         Tag::Header(_) | Tag::Table(_) | Tag::TableHead | Tag::TableRow | Tag::TableCell => {
             Tag::Paragraph
@@ -57,54 +55,7 @@ fn to_inline(tag: Tag<'_>) -> Tag<'_> {
         t => t,
     }
 }
-struct HighlighterContext {
+
-    content: Vec<String>,
-}
-fn highlight_code<'a>(
-    context: &mut Option<HighlighterContext>,
-    evt: Event<'a>,
-) -> Option<Vec<Event<'a>>> {
-    match evt {
-        Event::Start(Tag::CodeBlock(lang)) => {
-            if lang.is_empty() {
-                Some(vec![Event::Start(Tag::CodeBlock(lang))])
-            } else {
-                *context = Some(HighlighterContext { content: vec![] });
-                Some(vec![Event::Start(Tag::CodeBlock(lang))])
-            }
-        }
-        Event::End(Tag::CodeBlock(x)) => {
-            let mut result = vec![];
-            if let Some(ctx) = context.take() {
-                let syntax_set = SyntaxSet::load_defaults_newlines();
-                let syntax = syntax_set.find_syntax_by_token(&x).unwrap_or_else(|| {
-                    syntax_set
-                        .find_syntax_by_name(&x)
-                        .unwrap_or_else(|| syntax_set.find_syntax_plain_text())
-                });
-                let mut html = ClassedHTMLGenerator::new(&syntax, &syntax_set);
-                for line in ctx.content {
-                    html.parse_html_for_line(&line);
-                }
-                let q = html.finalize();
-                result.push(Event::Html(q.into()));
-            }
-            result.push(Event::End(Tag::CodeBlock(x)));
-            *context = None;
-            Some(result)
-        }
-        Event::Text(t) => {
-            if let Some(mut c) = context.take() {
-                c.content.push(t.to_string());
-                *context = Some(c);
-                Some(vec![])
-            } else {
-                Some(vec![Event::Text(t)])
-            }
-        }
-        _ => Some(vec![evt]),
-    }
-}
 fn flatten_text<'a>(state: &mut Option<String>, evt: Event<'a>) -> Option<Vec<Event<'a>>> {
     let (s, res) = match evt {
         Event::Text(txt) => match state.take() {
@@ -157,7 +108,9 @@ fn process_image<'a, 'b>(
         match evt {
             Event::Start(Tag::Image(id, title)) => {
                 if let Some((url, cw)) = id.parse::<i32>().ok().and_then(processor.as_ref()) {
-                    if let (Some(cw), false) = (cw, inline) {
+                    if inline || cw.is_none() {
+                        Event::Start(Tag::Image(Cow::Owned(url), title))
+                    } else {
                         // there is a cw, and where are not inline
                         Event::Html(Cow::Owned(format!(
                             r#"<label for="postcontent-cw-{id}">
@@ -168,11 +121,9 @@ fn process_image<'a, 'b>(
     </span>
   <img src="{url}" alt=""#,
                             id = random_hex(),
-                            cw = cw,
+                            cw = cw.unwrap(),
                             url = url
                         )))
-                    } else {
-                        Event::Start(Tag::Image(Cow::Owned(url), title))
                     }
                 } else {
                     Event::Start(Tag::Image(id, title))
@@ -214,24 +165,14 @@ pub fn md_to_html<'a>(
     };
     let parser = Parser::new_ext(md, Options::all());
 
-    let (parser, mentions, hashtags): (Vec<Event<'_>>, Vec<String>, Vec<String>) = parser
+    let (parser, mentions, hashtags): (Vec<Event>, Vec<String>, Vec<String>) = parser
         // Flatten text because pulldown_cmark break #hashtag in two individual text elements
         .scan(None, flatten_text)
-        .flatten()
+        .flat_map(IntoIterator::into_iter)
-        .scan(None, highlight_code)
-        .flatten()
         .map(|evt| process_image(evt, inline, &media_processor))
         // Ignore headings, images, and tables if inline = true
         .scan((vec![], inline), inline_tags)
-        .scan(false, |in_code, evt| match evt {
+        .map(|evt| match evt {
-            Event::Start(Tag::CodeBlock(_)) | Event::Start(Tag::Code) => {
-                *in_code = true;
-                Some((vec![evt], vec![], vec![]))
-            }
-            Event::End(Tag::CodeBlock(_)) | Event::End(Tag::Code) => {
-                *in_code = false;
-                Some((vec![evt], vec![], vec![]))
-            }
             Event::Text(txt) => {
                 let (evts, _, _, _, new_mentions, new_hashtags) = txt.chars().fold(
                     (vec![], State::Ready, String::new(), 0, vec![], vec![]),
@@ -247,7 +188,7 @@ pub fn md_to_html<'a>(
                                         text_acc.push(c)
                                     }
                                     let mention = text_acc;
-                                    let short_mention = mention.splitn(1, '@').next().unwrap_or("");
+                                    let short_mention = mention.splitn(1, '@').nth(0).unwrap_or("");
                                     let link = Tag::Link(
                                         format!("{}@/{}/", base_url, &mention).into(),
                                         short_mention.to_owned().into(),
@@ -300,7 +241,7 @@ pub fn md_to_html<'a>(
                                 }
                             }
                             State::Ready => {
-                                if !*in_code && c == '@' {
+                                if c == '@' {
                                     events.push(Event::Text(text_acc.into()));
                                     (
                                         events,
@@ -310,7 +251,7 @@ pub fn md_to_html<'a>(
                                         mentions,
                                         hashtags,
                                     )
-                                } else if !*in_code && c == '#' {
+                                } else if c == '#' {
                                     events.push(Event::Text(text_acc.into()));
                                     (
                                         events,
@@ -355,9 +296,9 @@ pub fn md_to_html<'a>(
                         }
                     },
                 );
-                Some((evts, new_mentions, new_hashtags))
+                (evts, new_mentions, new_hashtags)
             }
-            _ => Some((vec![evt], vec![], vec![])),
+            _ => (vec![evt], vec![], vec![]),
         })
         .fold(
             (vec![], vec![], vec![]),
@@ -394,11 +335,9 @@ mod tests {
             ("mention at @end", vec!["end"]),
             ("between parenthesis (@test)", vec!["test"]),
             ("with some punctuation @test!", vec!["test"]),
-            (" @spaces     ", vec!["spaces"]),
+            ("      @spaces     ", vec!["spaces"]),
             ("@is_a@mention", vec!["is_a@mention"]),
             ("not_a@mention", vec![]),
-            ("`@helo`", vec![]),
-            ("```\n@hello\n```", vec![]),
         ];
 
         for (md, mentions) in tests {
@@ -422,7 +361,7 @@ mod tests {
             ("hashtag at #end", vec!["end"]),
             ("between parenthesis (#test)", vec!["test"]),
             ("with some punctuation #test!", vec!["test"]),
-            (" #spaces     ", vec!["spaces"]),
+            ("      #spaces     ", vec!["spaces"]),
             ("not_a#hashtag", vec![]),
         ];
 

plume-front/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-front"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 stdweb = "=0.4.18"
@@ -12,7 +11,4 @@ gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = "
 gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
 lazy_static = "1.3"
 serde = "1.0"
-serde_json = "1.0"
+serde_json = "1.0"
-
-[features]
-ci = []

plume-front/src/editor.rs

@@ -1,4 +1,3 @@
-use crate::CATALOG;
 use serde::{Deserialize, Serialize};
 use serde_json;
 use std::sync::Mutex;
@@ -6,6 +5,7 @@ use stdweb::{
     unstable::{TryFrom, TryInto},
     web::{event::*, html_element::*, *},
 };
+use CATALOG;
 
 macro_rules! mv {
     ( $( $var:ident ),* => $exp:expr ) => {

plume-front/src/main.rs

@@ -1,13 +1,15 @@
 #![recursion_limit = "128"]
 #![feature(decl_macro, proc_macro_hygiene, try_trait)]
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
 
+extern crate gettext;
 #[macro_use]
 extern crate gettext_macros;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
 extern crate stdweb;
+extern crate serde;
+extern crate serde_json;
 use stdweb::web::{event::*, *};
 
 init_i18n!(

plume-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plume-macro"
-version = "0.4.0"
+version = "0.1.0"
 authors = ["Trinity Pointard <trinity.pointard@insa-rennes.fr>"]
 edition = "2018"
 description = "Plume procedural macros"
@@ -19,4 +19,3 @@ syn = "0.15.27"
 default = []
 postgres = []
 sqlite = []
-ci = []

plume-macro/src/lib.rs

@@ -1,8 +1,8 @@
 #![recursion_limit = "128"]
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
+extern crate proc_macro;
-
 #[macro_use]
 extern crate quote;
+extern crate syn;
 
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
@@ -103,17 +103,19 @@ fn file_to_migration(file: &str) -> TokenStream2 {
                 acc.push_str(line);
                 acc.push('\n');
             }
-        } else if line.starts_with("--#!") {
-            acc.push_str(&line[4..]);
-            acc.push('\n');
-        } else if line.starts_with("--") {
-            continue;
         } else {
-            let func: TokenStream2 = trampoline(TokenStream::from_str(&acc).unwrap().into());
+            if line.starts_with("--#!") {
-            actions.push(quote!(Action::Function(&#func)));
+                acc.push_str(&line[4..]);
-            sql = true;
+                acc.push('\n');
-            acc = line.to_string();
+            } else if line.starts_with("--") {
-            acc.push('\n');
+                continue;
+            } else {
+                let func: TokenStream2 = trampoline(TokenStream::from_str(&acc).unwrap().into());
+                actions.push(quote!(Action::Function(&#func)));
+                sql = true;
+                acc = line.to_string();
+                acc.push('\n');
+            }
         }
     }
     if !acc.trim().is_empty() {

plume-models/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-models"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 activitypub = "0.1.1"
@@ -12,7 +11,7 @@ bcrypt = "0.5"
 guid-create = "0.1"
 heck = "0.3.0"
 itertools = "0.8.0"
-lazy_static = "1.0"
+lazy_static = "*"
 migrations_internals= "1.4.0"
 openssl = "0.10.22"
 rocket = "0.4.0"
@@ -29,7 +28,6 @@ webfinger = "0.4.1"
 whatlang = "0.7.1"
 shrinkwraprs = "0.2.1"
 diesel-derive-newtype = "0.1.2"
-glob = "0.3.0"
 
 [dependencies.chrono]
 features = ["serde"]
@@ -54,4 +52,3 @@ diesel_migrations = "1.3.0"
 [features]
 postgres = ["diesel/postgres", "plume-macro/postgres" ]
 sqlite = ["diesel/sqlite", "plume-macro/sqlite" ]
-ci = ["plume-macro/ci"]

plume-models/src/admin.rs

@@ -1,10 +1,11 @@
-use crate::users::User;
 use rocket::{
     http::Status,
     request::{self, FromRequest, Request},
     Outcome,
 };
 
+use users::User;
+
 /// Wrapper around User to use as a request guard on pages reserved to admins.
 pub struct Admin(pub User);
 

plume-models/src/api_tokens.rs

@@ -1,4 +1,3 @@
-use crate::{db_conn::DbConn, schema::api_tokens, Error, Result};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use rocket::{
@@ -7,6 +6,10 @@ use rocket::{
     Outcome,
 };
 
+use db_conn::DbConn;
+use schema::api_tokens;
+use {Error, Result};
+
 #[derive(Clone, Queryable)]
 pub struct ApiToken {
     pub id: i32,

plume-models/src/apps.rs

@@ -1,7 +1,9 @@
-use crate::{schema::apps, Error, Result};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 
+use schema::apps;
+use {Error, Result};
+
 #[derive(Clone, Queryable, Serialize)]
 pub struct App {
     pub id: i32,

plume-models/src/blocklisted_emails.rs

@@ -1,139 +0,0 @@
-use crate::{schema::email_blocklist, Connection, Error, Result};
-use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, TextExpressionMethods};
-use glob::Pattern;
-
-#[derive(Clone, Queryable, Identifiable)]
-#[table_name = "email_blocklist"]
-pub struct BlocklistedEmail {
-    pub id: i32,
-    pub email_address: String,
-    pub note: String,
-    pub notify_user: bool,
-    pub notification_text: String,
-}
-
-#[derive(Insertable, FromForm)]
-#[table_name = "email_blocklist"]
-pub struct NewBlocklistedEmail {
-    pub email_address: String,
-    pub note: String,
-    pub notify_user: bool,
-    pub notification_text: String,
-}
-
-impl BlocklistedEmail {
-    insert!(email_blocklist, NewBlocklistedEmail);
-    get!(email_blocklist);
-    find_by!(email_blocklist, find_by_id, id as i32);
-    pub fn delete_entries(conn: &Connection, ids: Vec<i32>) -> Result<bool> {
-        use diesel::delete;
-        for i in ids {
-            let be: BlocklistedEmail = BlocklistedEmail::find_by_id(&conn, i)?;
-            delete(&be).execute(conn)?;
-        }
-        Ok(true)
-    }
-    pub fn find_for_domain(conn: &Connection, domain: &str) -> Result<Vec<BlocklistedEmail>> {
-        let effective = format!("%@{}", domain);
-        email_blocklist::table
-            .filter(email_blocklist::email_address.like(effective))
-            .load::<BlocklistedEmail>(conn)
-            .map_err(Error::from)
-    }
-    pub fn matches_blocklist(conn: &Connection, email: &str) -> Result<Option<BlocklistedEmail>> {
-        let mut result = email_blocklist::table.load::<BlocklistedEmail>(conn)?;
-        for i in result.drain(..) {
-            if let Ok(x) = Pattern::new(&i.email_address) {
-                if x.matches(email) {
-                    return Ok(Some(i));
-                }
-            }
-        }
-        Ok(None)
-    }
-    pub fn page(conn: &Connection, (min, max): (i32, i32)) -> Result<Vec<BlocklistedEmail>> {
-        email_blocklist::table
-            .offset(min.into())
-            .limit((max - min).into())
-            .load::<BlocklistedEmail>(conn)
-            .map_err(Error::from)
-    }
-    pub fn count(conn: &Connection) -> Result<i64> {
-        email_blocklist::table
-            .count()
-            .get_result(conn)
-            .map_err(Error::from)
-    }
-    pub fn pattern_errors(pat: &str) -> Option<glob::PatternError> {
-        let c = Pattern::new(pat);
-        c.err()
-    }
-    pub fn new(
-        conn: &Connection,
-        pattern: &str,
-        note: &str,
-        show_notification: bool,
-        notification_text: &str,
-    ) -> Result<BlocklistedEmail> {
-        let c = NewBlocklistedEmail {
-            email_address: pattern.to_owned(),
-            note: note.to_owned(),
-            notify_user: show_notification,
-            notification_text: notification_text.to_owned(),
-        };
-        BlocklistedEmail::insert(conn, c)
-    }
-}
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-    use crate::{instance::tests as instance_tests, tests::rockets, Connection as Conn};
-    use diesel::Connection;
-
-    pub(crate) fn fill_database(conn: &Conn) -> Vec<BlocklistedEmail> {
-        instance_tests::fill_database(conn);
-        let domainblock =
-            BlocklistedEmail::new(conn, "*@bad-actor.com", "Mean spammers", false, "").unwrap();
-        let userblock = BlocklistedEmail::new(
-            conn,
-            "spammer@lax-administration.com",
-            "Decent enough domain, but this user is a problem.",
-            true,
-            "Stop it please",
-        )
-        .unwrap();
-        vec![domainblock, userblock]
-    }
-    #[test]
-    fn test_match() {
-        let r = rockets();
-        let conn = &*r.conn;
-        conn.test_transaction::<_, (), _>(|| {
-            let various = fill_database(conn);
-            let match1 = "user1@bad-actor.com";
-            let match2 = "spammer@lax-administration.com";
-            let no_match = "happy-user@lax-administration.com";
-            assert_eq!(
-                BlocklistedEmail::matches_blocklist(conn, match1)
-                    .unwrap()
-                    .unwrap()
-                    .id,
-                various[0].id
-            );
-            assert_eq!(
-                BlocklistedEmail::matches_blocklist(conn, match2)
-                    .unwrap()
-                    .unwrap()
-                    .id,
-                various[1].id
-            );
-            assert_eq!(
-                BlocklistedEmail::matches_blocklist(conn, no_match)
-                    .unwrap()
-                    .is_none(),
-                true
-            );
-            Ok(())
-        });
-    }
-}

plume-models/src/blog_authors.rs

@@ -1,6 +1,8 @@
-use crate::{schema::blog_authors, Error, Result};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 
+use schema::blog_authors;
+use {Error, Result};
+
 #[derive(Clone, Queryable, Identifiable)]
 pub struct BlogAuthor {
     pub id: i32,

plume-models/src/blogs.rs

@@ -1,7 +1,3 @@
-use crate::{
-    ap_url, instance::*, medias::Media, posts::Post, safe_string::SafeString, schema::blogs,
-    search::Searcher, users::User, Connection, Error, PlumeRocket, Result, ITEMS_PER_PAGE,
-};
 use activitypub::{
     actor::Group,
     collection::{OrderedCollection, OrderedCollectionPage},
@@ -16,13 +12,22 @@ use openssl::{
     rsa::Rsa,
     sign::{Signer, Verifier},
 };
+use serde_json;
+use url::Url;
+use webfinger::*;
+
+use instance::*;
+use medias::Media;
 use plume_common::activity_pub::{
     inbox::{AsActor, FromId},
     sign, ActivityStream, ApSignature, Id, IntoId, PublicKey, Source,
 };
-use serde_json;
+use posts::Post;
-use url::Url;
+use safe_string::SafeString;
-use webfinger::*;
+use schema::blogs;
+use search::Searcher;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result, ITEMS_PER_PAGE};
 
 pub type CustomGroup = CustomObject<ApSignature, Group>;
 
@@ -101,8 +106,8 @@ impl Blog {
     }
 
     pub fn list_authors(&self, conn: &Connection) -> Result<Vec<User>> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
-        use crate::schema::users;
+        use schema::users;
         let authors_ids = blog_authors::table
             .filter(blog_authors::blog_id.eq(self.id))
             .select(blog_authors::author_id);
@@ -113,7 +118,7 @@ impl Blog {
     }
 
     pub fn count_authors(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
         blog_authors::table
             .filter(blog_authors::blog_id.eq(self.id))
             .count()
@@ -122,7 +127,7 @@ impl Blog {
     }
 
     pub fn find_for_author(conn: &Connection, author: &User) -> Result<Vec<Blog>> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
         let author_ids = blog_authors::table
             .filter(blog_authors::author_id.eq(author.id))
             .select(blog_authors::blog_id);
@@ -496,16 +501,14 @@ impl NewBlog {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{
+    use blog_authors::*;
-        blog_authors::*,
-        instance::tests as instance_tests,
-        medias::NewMedia,
-        search::tests::get_searcher,
-        tests::{db, rockets},
-        users::tests as usersTests,
-        Connection as Conn,
-    };
     use diesel::Connection;
+    use instance::tests as instance_tests;
+    use medias::NewMedia;
+    use search::tests::get_searcher;
+    use tests::{db, rockets};
+    use users::tests as usersTests;
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> (Vec<User>, Vec<Blog>) {
         instance_tests::fill_database(conn);

plume-models/src/comment_seers.rs

@@ -1,6 +1,10 @@
-use crate::{comments::Comment, schema::comment_seers, users::User, Connection, Error, Result};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 
+use comments::Comment;
+use schema::comment_seers;
+use users::User;
+use {Connection, Error, Result};
+
 #[derive(Queryable, Clone)]
 pub struct CommentSeers {
     pub id: i32,

plume-models/src/comments.rs

@@ -1,15 +1,3 @@
-use crate::{
-    comment_seers::{CommentSeers, NewCommentSeers},
-    instance::Instance,
-    medias::Media,
-    mentions::Mention,
-    notifications::*,
-    posts::Post,
-    safe_string::SafeString,
-    schema::comments,
-    users::User,
-    Connection, Error, PlumeRocket, Result,
-};
 use activitypub::{
     activity::{Create, Delete},
     link,
@@ -17,16 +5,26 @@ use activitypub::{
 };
 use chrono::{self, NaiveDateTime};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
-use plume_common::{
-    activity_pub::{
-        inbox::{AsActor, AsObject, FromId},
-        Id, IntoId, PUBLIC_VISIBILITY,
-    },
-    utils,
-};
 use serde_json;
+
 use std::collections::HashSet;
 
+use comment_seers::{CommentSeers, NewCommentSeers};
+use instance::Instance;
+use medias::Media;
+use mentions::Mention;
+use notifications::*;
+use plume_common::activity_pub::{
+    inbox::{AsActor, AsObject, FromId},
+    Id, IntoId, PUBLIC_VISIBILITY,
+};
+use plume_common::utils;
+use posts::Post;
+use safe_string::SafeString;
+use schema::comments;
+use users::User;
+use {Connection, Error, PlumeRocket, Result};
+
 #[derive(Queryable, Identifiable, Clone, AsChangeset)]
 pub struct Comment {
     pub id: i32,
@@ -79,7 +77,7 @@ impl Comment {
     }
 
     pub fn count_local(conn: &Connection) -> Result<i64> {
-        use crate::schema::users;
+        use schema::users;
         let local_authors = users::table
             .filter(users::instance_id.eq(Instance::get_local()?.id))
             .select(users::id);
@@ -129,8 +127,9 @@ impl Comment {
             )?))?;
         note.object_props
             .set_published_string(chrono::Utc::now().to_rfc3339())?;
-        note.object_props.set_attributed_to_link(author.into_id())?;
+        note.object_props
-        note.object_props.set_to_link_vec(to)?;
+            .set_attributed_to_link(author.clone().into_id())?;
+        note.object_props.set_to_link_vec(to.clone())?;
         note.object_props.set_tag_link_vec(
             mentions
                 .into_iter()

plume-models/src/db_conn.rs

@@ -1,4 +1,3 @@
-use crate::Connection;
 use diesel::r2d2::{
     ConnectionManager, CustomizeConnection, Error as ConnError, Pool, PooledConnection,
 };
@@ -11,6 +10,8 @@ use rocket::{
 };
 use std::ops::Deref;
 
+use Connection;
+
 pub type DbPool = Pool<ConnectionManager<Connection>>;
 
 // From rocket documentation
@@ -25,7 +26,7 @@ impl<'a, 'r> FromRequest<'a, 'r> for DbConn {
     type Error = ();
 
     fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
-        let pool = request.guard::<State<'_, DbPool>>()?;
+        let pool = request.guard::<State<DbPool>>()?;
         match pool.get() {
             Ok(conn) => Outcome::Success(DbConn(conn)),
             Err(_) => Outcome::Failure((Status::ServiceUnavailable, ())),

plume-models/src/follows.rs

@@ -1,15 +1,16 @@
-use crate::{
-    ap_url, notifications::*, schema::follows, users::User, Connection, Error, PlumeRocket, Result,
-    CONFIG,
-};
 use activitypub::activity::{Accept, Follow as FollowAct, Undo};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
+
+use notifications::*;
 use plume_common::activity_pub::{
     broadcast,
     inbox::{AsActor, AsObject, FromId},
     sign::Signer,
     Id, IntoId, PUBLIC_VISIBILITY,
 };
+use schema::follows;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result, CONFIG};
 
 #[derive(Clone, Queryable, Identifiable, Associations, AsChangeset)]
 #[belongs_to(User, foreign_key = "following_id")]
@@ -55,7 +56,8 @@ impl Follow {
         let target = User::get(conn, self.following_id)?;
 
         let mut act = FollowAct::default();
-        act.follow_props.set_actor_link::<Id>(user.into_id())?;
+        act.follow_props
+            .set_actor_link::<Id>(user.clone().into_id())?;
         act.follow_props
             .set_object_link::<Id>(target.clone().into_id())?;
         act.object_props.set_id_string(self.ap_url.clone())?;
@@ -200,8 +202,9 @@ impl IntoId for Follow {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{tests::db, users::tests as user_tests};
     use diesel::Connection;
+    use tests::db;
+    use users::tests as user_tests;
 
     #[test]
     fn test_id() {

plume-models/src/instance.rs

@@ -1,16 +1,15 @@
-use crate::{
-    ap_url,
-    medias::Media,
-    safe_string::SafeString,
-    schema::{instances, users},
-    users::{Role, User},
-    Connection, Error, Result,
-};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
-use plume_common::utils::md_to_html;
 use std::sync::RwLock;
 
+use ap_url;
+use medias::Media;
+use plume_common::utils::md_to_html;
+use safe_string::SafeString;
+use schema::{instances, users};
+use users::{Role, User};
+use {Connection, Error, Result};
+
 #[derive(Clone, Identifiable, Queryable)]
 pub struct Instance {
     pub id: i32,
@@ -243,8 +242,9 @@ impl Instance {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{tests::db, Connection as Conn};
     use diesel::Connection;
+    use tests::db;
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> Vec<(NewInstance, Instance)> {
         let res = vec![

plume-models/src/lib.rs

@@ -1,22 +1,42 @@
 #![feature(try_trait)]
 #![feature(never_type)]
+//#![feature(register_attr)]
+//#![feature(register_tool)]
 #![feature(proc_macro_hygiene)]
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
 
+extern crate activitypub;
+extern crate ammonia;
+extern crate askama_escape;
+extern crate bcrypt;
+extern crate chrono;
 #[macro_use]
 extern crate diesel;
+extern crate guid_create;
+extern crate heck;
+extern crate itertools;
 #[macro_use]
 extern crate lazy_static;
+extern crate migrations_internals;
+extern crate openssl;
+extern crate plume_api;
+extern crate plume_common;
 #[macro_use]
 extern crate plume_macro;
-#[macro_use]
+extern crate reqwest;
 extern crate rocket;
+extern crate rocket_i18n;
+extern crate scheduled_thread_pool;
+extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
 #[macro_use]
 extern crate tantivy;
+extern crate url;
+extern crate walkdir;
+extern crate webfinger;
+extern crate whatlang;
 
 use plume_common::activity_pub::inbox::InboxError;
 
@@ -34,7 +54,6 @@ pub type Connection = diesel::PgConnection;
 /// All the possible errors that can be encoutered in this crate
 #[derive(Debug)]
 pub enum Error {
-    Blocklisted(bool, String),
     Db(diesel::result::Error),
     Inbox(Box<InboxError<Error>>),
     InvalidValue,
@@ -229,10 +248,10 @@ macro_rules! get {
 /// Model::insert(connection, NewModelType::new());
 /// ```
 macro_rules! insert {
-    ($table:ident, $from:ty) => {
+    ($table:ident, $from:ident) => {
         insert!($table, $from, |x, _conn| Ok(x));
     };
-    ($table:ident, $from:ty, |$val:ident, $conn:ident | $( $after:tt )+) => {
+    ($table:ident, $from:ident, |$val:ident, $conn:ident | $( $after:tt )+) => {
         last!($table);
 
         #[allow(dead_code)]
@@ -282,12 +301,16 @@ pub fn ap_url(url: &str) -> String {
 #[cfg(test)]
 #[macro_use]
 mod tests {
-    use crate::{db_conn, migrations::IMPORTED_MIGRATIONS, search, Connection as Conn, CONFIG};
+    use db_conn;
     use diesel::r2d2::ConnectionManager;
+    use migrations::IMPORTED_MIGRATIONS;
     use plume_common::utils::random_hex;
     use scheduled_thread_pool::ScheduledThreadPool;
+    use search;
     use std::env::temp_dir;
     use std::sync::Arc;
+    use Connection as Conn;
+    use CONFIG;
 
     #[macro_export]
     macro_rules! part_eq {
@@ -331,7 +354,6 @@ mod tests {
 pub mod admin;
 pub mod api_tokens;
 pub mod apps;
-pub mod blocklisted_emails;
 pub mod blog_authors;
 pub mod blogs;
 pub mod comment_seers;

plume-models/src/likes.rs

@@ -1,14 +1,17 @@
-use crate::{
-    notifications::*, posts::Post, schema::likes, timeline::*, users::User, Connection, Error,
-    PlumeRocket, Result,
-};
 use activitypub::activity;
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use notifications::*;
 use plume_common::activity_pub::{
     inbox::{AsActor, AsObject, FromId},
     Id, IntoId, PUBLIC_VISIBILITY,
 };
+use posts::Post;
+use schema::likes;
+use timeline::*;
+use users::User;
+use {Connection, Error, PlumeRocket, Result};
 
 #[derive(Clone, Queryable, Identifiable)]
 pub struct Like {

plume-models/src/lists.rs

@@ -1,11 +1,10 @@
-use crate::{
-    blogs::Blog,
-    schema::{blogs, list_elems, lists, users},
-    users::User,
-    Connection, Error, Result,
-};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use blogs::Blog;
+use schema::{blogs, list_elems, lists, users};
 use std::convert::{TryFrom, TryInto};
+use users::User;
+use {Connection, Error, Result};
 
 /// Represent what a list is supposed to store. Represented in database as an integer
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -165,7 +164,7 @@ impl List {
     last!(lists);
     get!(lists);
 
-    fn insert(conn: &Connection, val: NewList<'_>) -> Result<Self> {
+    fn insert(conn: &Connection, val: NewList) -> Result<Self> {
         diesel::insert_into(lists::table)
             .values(val)
             .execute(conn)?;
@@ -310,7 +309,7 @@ mod private {
     };
 
     impl ListElem {
-        insert!(list_elems, NewListElem<'_>);
+        insert!(list_elems, NewListElem);
 
         pub fn user_in_list(conn: &Connection, list: &List, user: i32) -> Result<bool> {
             dsl::select(dsl::exists(
@@ -360,8 +359,9 @@ mod private {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{blogs::tests as blog_tests, tests::db};
+    use blogs::tests as blog_tests;
     use diesel::Connection;
+    use tests::db;
 
     #[test]
     fn list_type() {

plume-models/src/medias.rs

@@ -1,17 +1,20 @@
-use crate::{
-    ap_url, instance::Instance, safe_string::SafeString, schema::medias, users::User, Connection,
-    Error, PlumeRocket, Result,
-};
 use activitypub::object::Image;
 use askama_escape::escape;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use guid_create::GUID;
+use reqwest;
+use std::{fs, path::Path};
+
 use plume_common::{
     activity_pub::{inbox::FromId, Id},
     utils::MediaProcessor,
 };
-use reqwest;
+
-use std::{fs, path::Path};
+use instance::Instance;
+use safe_string::SafeString;
+use schema::medias;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result};
 
 #[derive(Clone, Identifiable, Queryable)]
 pub struct Media {
@@ -260,11 +263,13 @@ impl Media {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{tests::db, users::tests as usersTests, Connection as Conn};
     use diesel::Connection;
     use std::env::{current_dir, set_current_dir};
     use std::fs;
     use std::path::Path;
+    use tests::db;
+    use users::tests as usersTests;
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> (Vec<User>, Vec<Media>) {
         let mut wd = current_dir().unwrap().to_path_buf();

plume-models/src/mentions.rs

@@ -1,10 +1,14 @@
-use crate::{
-    comments::Comment, notifications::*, posts::Post, schema::mentions, users::User, Connection,
-    Error, PlumeRocket, Result,
-};
 use activitypub::link;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use comments::Comment;
+use notifications::*;
 use plume_common::activity_pub::inbox::AsActor;
+use posts::Post;
+use schema::mentions;
+use users::User;
+use PlumeRocket;
+use {Connection, Error, Result};
 
 #[derive(Clone, Queryable, Identifiable)]
 pub struct Mention {

plume-models/src/migrations.rs

@@ -1,6 +1,10 @@
-use crate::{Connection, Error, Result};
+use Connection;
+use Error;
+use Result;
+
 use diesel::connection::{Connection as Conn, SimpleConnection};
 use migrations_internals::{setup_database, MigrationConnection};
+
 use std::path::Path;
 
 #[allow(dead_code)] //variants might not be constructed if not required by current migrations

plume-models/src/notifications.rs

@@ -1,17 +1,16 @@
-use crate::{
-    comments::Comment,
-    follows::Follow,
-    likes::Like,
-    mentions::Mention,
-    posts::Post,
-    reshares::Reshare,
-    schema::{follows, notifications},
-    users::User,
-    Connection, Error, Result,
-};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, JoinOnDsl, QueryDsl, RunQueryDsl};
 
+use comments::Comment;
+use follows::Follow;
+use likes::Like;
+use mentions::Mention;
+use posts::Post;
+use reshares::Reshare;
+use schema::{follows, notifications};
+use users::User;
+use {Connection, Error, Result};
+
 pub mod notification_kind {
     pub const COMMENT: &str = "COMMENT";
     pub const FOLLOW: &str = "FOLLOW";

plume-models/src/password_reset_requests.rs

@@ -1,6 +1,7 @@
-use crate::{schema::password_reset_requests, Connection, Error, Result};
 use chrono::{offset::Utc, Duration, NaiveDateTime};
 use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
+use schema::password_reset_requests;
+use {Connection, Error, Result};
 
 #[derive(Clone, Identifiable, Queryable)]
 pub struct PasswordResetRequest {
@@ -74,8 +75,9 @@ impl PasswordResetRequest {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{tests::db, users::tests as user_tests};
     use diesel::Connection;
+    use tests::db;
+    use users::tests as user_tests;
 
     #[test]
     fn test_insert_and_find_password_reset_request() {

plume-models/src/plume_rocket.rs

@@ -2,7 +2,9 @@ pub use self::module::PlumeRocket;
 
 #[cfg(not(test))]
 mod module {
-    use crate::{db_conn::DbConn, search, users};
+    use crate::db_conn::DbConn;
+    use crate::search;
+    use crate::users;
     use rocket::{
         request::{self, FlashMessage, FromRequest, Request},
         Outcome, State,
@@ -27,9 +29,9 @@ mod module {
             let conn = request.guard::<DbConn>()?;
             let intl = request.guard::<rocket_i18n::I18n>()?;
             let user = request.guard::<users::User>().succeeded();
-            let worker = request.guard::<'_, State<'_, Arc<ScheduledThreadPool>>>()?;
+            let worker = request.guard::<State<Arc<ScheduledThreadPool>>>()?;
-            let searcher = request.guard::<'_, State<'_, Arc<search::Searcher>>>()?;
+            let searcher = request.guard::<State<Arc<search::Searcher>>>()?;
-            let flash_msg = request.guard::<FlashMessage<'_, '_>>().succeeded();
+            let flash_msg = request.guard::<FlashMessage>().succeeded();
             Outcome::Success(PlumeRocket {
                 conn,
                 intl,
@@ -44,7 +46,9 @@ mod module {
 
 #[cfg(test)]
 mod module {
-    use crate::{db_conn::DbConn, search, users};
+    use crate::db_conn::DbConn;
+    use crate::search;
+    use crate::users;
     use rocket::{
         request::{self, FromRequest, Request},
         Outcome, State,
@@ -66,8 +70,8 @@ mod module {
         fn from_request(request: &'a Request<'r>) -> request::Outcome<PlumeRocket, ()> {
             let conn = request.guard::<DbConn>()?;
             let user = request.guard::<users::User>().succeeded();
-            let worker = request.guard::<'_, State<'_, Arc<ScheduledThreadPool>>>()?;
+            let worker = request.guard::<State<Arc<ScheduledThreadPool>>>()?;
-            let searcher = request.guard::<'_, State<'_, Arc<search::Searcher>>>()?;
+            let searcher = request.guard::<State<Arc<search::Searcher>>>()?;
             Outcome::Success(PlumeRocket {
                 conn,
                 user,

plume-models/src/post_authors.rs

@@ -1,6 +1,10 @@
-use crate::{posts::Post, schema::post_authors, users::User, Error, Result};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 
+use posts::Post;
+use schema::post_authors;
+use users::User;
+use {Error, Result};
+
 #[derive(Clone, Queryable, Identifiable, Associations)]
 #[belongs_to(Post)]
 #[belongs_to(User, foreign_key = "author_id")]

plume-models/src/posts.rs

@@ -1,8 +1,3 @@
-use crate::{
-    ap_url, blogs::Blog, instance::Instance, medias::Media, mentions::Mention, post_authors::*,
-    safe_string::SafeString, schema::posts, search::Searcher, tags::*, timeline::*, users::User,
-    Connection, Error, PlumeRocket, Result, CONFIG,
-};
 use activitypub::{
     activity::{Create, Delete, Update},
     link,
@@ -12,6 +7,13 @@ use activitypub::{
 use chrono::{NaiveDateTime, TimeZone, Utc};
 use diesel::{self, BelongingToDsl, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
 use heck::{CamelCase, KebabCase};
+use serde_json;
+use std::collections::HashSet;
+
+use blogs::Blog;
+use instance::Instance;
+use medias::Media;
+use mentions::Mention;
 use plume_common::{
     activity_pub::{
         inbox::{AsObject, FromId},
@@ -19,8 +21,14 @@ use plume_common::{
     },
     utils::md_to_html,
 };
-use serde_json;
+use post_authors::*;
-use std::collections::HashSet;
+use safe_string::SafeString;
+use schema::posts;
+use search::Searcher;
+use tags::*;
+use timeline::*;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result, CONFIG};
 
 pub type LicensedArticle = CustomObject<Licensed, Article>;
 
@@ -103,7 +111,7 @@ impl Post {
         tag: String,
         (min, max): (i32, i32),
     ) -> Result<Vec<Post>> {
-        use crate::schema::tags;
+        use schema::tags;
 
         let ids = tags::table.filter(tags::tag.eq(tag)).select(tags::post_id);
         posts::table
@@ -117,7 +125,7 @@ impl Post {
     }
 
     pub fn count_for_tag(conn: &Connection, tag: String) -> Result<i64> {
-        use crate::schema::tags;
+        use schema::tags;
         let ids = tags::table.filter(tags::tag.eq(tag)).select(tags::post_id);
         posts::table
             .filter(posts::id.eq_any(ids))
@@ -131,8 +139,8 @@ impl Post {
     }
 
     pub fn count_local(conn: &Connection) -> Result<i64> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
-        use crate::schema::users;
+        use schema::users;
         let local_authors = users::table
             .filter(users::instance_id.eq(Instance::get_local()?.id))
             .select(users::id);
@@ -180,7 +188,7 @@ impl Post {
         author: &User,
         limit: i64,
     ) -> Result<Vec<Post>> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
 
         let posts = PostAuthor::belonging_to(author).select(post_authors::post_id);
         posts::table
@@ -231,7 +239,7 @@ impl Post {
     }
 
     pub fn drafts_by_author(conn: &Connection, author: &User) -> Result<Vec<Post>> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
 
         let posts = PostAuthor::belonging_to(author).select(post_authors::post_id);
         posts::table
@@ -243,8 +251,8 @@ impl Post {
     }
 
     pub fn get_authors(&self, conn: &Connection) -> Result<Vec<User>> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
-        use crate::schema::users;
+        use schema::users;
         let author_list = PostAuthor::belonging_to(self).select(post_authors::author_id);
         users::table
             .filter(users::id.eq_any(author_list))
@@ -253,7 +261,7 @@ impl Post {
     }
 
     pub fn is_author(&self, conn: &Connection, author_id: i32) -> Result<bool> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
         Ok(PostAuthor::belonging_to(self)
             .filter(post_authors::author_id.eq(author_id))
             .count()
@@ -262,7 +270,7 @@ impl Post {
     }
 
     pub fn get_blog(&self, conn: &Connection) -> Result<Blog> {
-        use crate::schema::blogs;
+        use schema::blogs;
         blogs::table
             .filter(blogs::id.eq(self.blog_id))
             .first(conn)
@@ -270,7 +278,7 @@ impl Post {
     }
 
     pub fn count_likes(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::likes;
+        use schema::likes;
         likes::table
             .filter(likes::post_id.eq(self.id))
             .count()
@@ -279,7 +287,7 @@ impl Post {
     }
 
     pub fn count_reshares(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::reshares;
+        use schema::reshares;
         reshares::table
             .filter(reshares::post_id.eq(self.id))
             .count()
@@ -624,7 +632,7 @@ impl FromId<PlumeRocket> for Post {
             .into_iter()
             .map(|s| s.to_camel_case())
             .collect::<HashSet<_>>();
-        if let Some(serde_json::Value::Array(tags)) = article.object_props.tag {
+        if let Some(serde_json::Value::Array(tags)) = article.object_props.tag.clone() {
             for tag in tags {
                 serde_json::from_value::<link::Mention>(tag.clone())
                     .map(|m| Mention::from_activity(conn, &m, post.id, true, true))
@@ -717,7 +725,7 @@ impl FromId<PlumeRocket> for PostUpdate {
                 .ok()
                 .map(|x| x.content),
             license: updated.custom_props.license_string().ok(),
-            tags: updated.object.object_props.tag,
+            tags: updated.object.object_props.tag.clone(),
         })
     }
 }
@@ -798,7 +806,7 @@ impl AsObject<User, Update, &PlumeRocket> for PostUpdate {
 
 impl IntoId for Post {
     fn into_id(self) -> Id {
-        Id::new(self.ap_url)
+        Id::new(self.ap_url.clone())
     }
 }
 

plume-models/src/reshares.rs

@@ -1,14 +1,17 @@
-use crate::{
-    notifications::*, posts::Post, schema::reshares, timeline::*, users::User, Connection, Error,
-    PlumeRocket, Result,
-};
 use activitypub::activity::{Announce, Undo};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use notifications::*;
 use plume_common::activity_pub::{
     inbox::{AsActor, AsObject, FromId},
     Id, IntoId, PUBLIC_VISIBILITY,
 };
+use posts::Post;
+use schema::reshares;
+use timeline::*;
+use users::User;
+use {Connection, Error, PlumeRocket, Result};
 
 #[derive(Clone, Queryable, Identifiable)]
 pub struct Reshare {

plume-models/src/safe_string.rs

@@ -31,41 +31,10 @@ lazy_static! {
             .add_tag_attributes("label", ["for"].iter())
             .add_tag_attributes("input", ["type", "checked"].iter())
             .add_allowed_classes("input", ["cw-checkbox"].iter())
-            .add_allowed_classes(
-                "span",
-                [
-                    "cw-container",
-                    "cw-text",
-                    //Scope classes for the syntax highlighting.
-                    "attribute-name",
-                    "comment",
-                    "constant",
-                    "control",
-                    "declaration",
-                    "entity",
-                    "function",
-                    "invalid",
-                    "keyword",
-                    "language",
-                    "modifier",
-                    "name",
-                    "numeric",
-                    "operator",
-                    "parameter",
-                    "punctuation",
-                    "source",
-                    "storage",
-                    "string",
-                    "support",
-                    "tag",
-                    "type",
-                    "variable",
-                ]
-                .iter(),
-            )
             // Related to https://github.com/Plume-org/Plume/issues/637
             .add_allowed_classes("sup", ["footnote-reference", "footnote-definition-label"].iter())
             .add_allowed_classes("div", ["footnote-definition"].iter())
+            .add_allowed_classes("span", ["cw-container", "cw-text"].iter())
             .attribute_filter(|elem, att, val| match (elem, att) {
                 ("input", "type") => Some("checkbox".into()),
                 ("input", "checked") => Some("checked".into()),
@@ -82,7 +51,7 @@ lazy_static! {
     };
 }
 
-fn url_add_prefix(url: &str) -> Option<Cow<'_, str>> {
+fn url_add_prefix(url: &str) -> Option<Cow<str>> {
     if url.starts_with('#') && !url.starts_with("#postcontent-") {
         //if start with an #
         let mut new_url = "#postcontent-".to_owned(); //change to valid id
@@ -139,7 +108,7 @@ struct SafeStringVisitor;
 impl<'de> Visitor<'de> for SafeStringVisitor {
     type Value = SafeString;
 
-    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         formatter.write_str("a string")
     }
 
@@ -181,7 +150,7 @@ where
     DB: diesel::backend::Backend,
     str: ToSql<diesel::sql_types::Text, DB>,
 {
-    fn to_sql<W: Write>(&self, out: &mut Output<'_, W, DB>) -> serialize::Result {
+    fn to_sql<W: Write>(&self, out: &mut Output<W, DB>) -> serialize::Result {
         str::to_sql(&self.value, out)
     }
 }
@@ -193,7 +162,7 @@ impl Borrow<str> for SafeString {
 }
 
 impl Display for SafeString {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{}", self.value)
     }
 }

plume-models/src/schema.rs

@@ -73,15 +73,6 @@ table! {
         user_id -> Int4,
     }
 }
-table! {
-    email_blocklist(id){
-        id -> Int4,
-        email_address -> VarChar,
-        note -> Text,
-        notify_user -> Bool,
-        notification_text -> Text,
-    }
-}
 
 table! {
     follows (id) {

plume-models/src/search/mod.rs

@@ -8,17 +8,15 @@ pub use self::searcher::*;
 pub(crate) mod tests {
     use super::{Query, Searcher};
     use diesel::Connection;
-    use plume_common::utils::random_hex;
     use std::env::temp_dir;
     use std::str::FromStr;
 
-    use crate::{
+    use blogs::tests::fill_database;
-        blogs::tests::fill_database,
+    use plume_common::utils::random_hex;
-        post_authors::*,
+    use post_authors::*;
-        posts::{NewPost, Post},
+    use posts::{NewPost, Post};
-        safe_string::SafeString,
+    use safe_string::SafeString;
-        tests::db,
+    use tests::db;
-    };
 
     pub(crate) fn get_searcher() -> Searcher {
         let dir = temp_dir().join(&format!("plume-test-{}", random_hex()));

plume-models/src/search/query.rs

@@ -1,5 +1,5 @@
-use crate::search::searcher::Searcher;
 use chrono::{naive::NaiveDate, offset::Utc, Datelike};
+use search::searcher::Searcher;
 use std::{cmp, ops::Bound};
 use tantivy::{query::*, schema::*, Term};
 

plume-models/src/search/searcher.rs

@@ -1,11 +1,9 @@
-use crate::{
+use instance::Instance;
-    instance::Instance,
+use posts::Post;
-    posts::Post,
+use schema::posts;
-    schema::posts,
+use tags::Tag;
-    search::{query::PlumeQuery, tokenizer},
+use Connection;
-    tags::Tag,
+
-    Connection, Result,
-};
 use chrono::Datelike;
 use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
 use itertools::Itertools;
@@ -16,6 +14,10 @@ use tantivy::{
 };
 use whatlang::{detect as detect_lang, Lang};
 
+use super::tokenizer;
+use search::query::PlumeQuery;
+use Result;
+
 #[derive(Debug)]
 pub enum SearcherError {
     IndexCreationError,
@@ -173,7 +175,7 @@ impl Searcher {
             post_id => i64::from(post.id),
             author => post.get_authors(conn)?.into_iter().map(|u| u.fqn).join(" "),
             creation_date => i64::from(post.creation_date.num_days_from_ce()),
-            instance => Instance::get(conn, post.get_blog(conn)?.instance_id)?.public_domain,
+            instance => Instance::get(conn, post.get_blog(conn)?.instance_id)?.public_domain.clone(),
             tag => Tag::for_post(conn, post.id)?.into_iter().map(|t| t.tag).join(" "),
             blog_name => post.get_blog(conn)?.title,
             content => post.content.get().clone(),

plume-models/src/tags.rs

@@ -1,6 +1,9 @@
-use crate::{ap_url, instance::Instance, schema::tags, Connection, Error, Result};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use instance::Instance;
 use plume_common::activity_pub::Hashtag;
+use schema::tags;
+use {ap_url, Connection, Error, Result};
 
 #[derive(Clone, Identifiable, Queryable)]
 pub struct Tag {

plume-models/src/timeline/mod.rs

@@ -1,17 +1,17 @@
-use crate::{
-    lists::List,
-    posts::Post,
-    schema::{posts, timeline, timeline_definition},
-    Connection, Error, PlumeRocket, Result,
-};
 use diesel::{self, BoolExpressionMethods, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use lists::List;
+use posts::Post;
+use schema::{posts, timeline, timeline_definition};
 use std::ops::Deref;
+use {Connection, Error, PlumeRocket, Result};
 
 pub(crate) mod query;
 
-pub use self::query::Kind;
 use self::query::{QueryError, TimelineQuery};
 
+pub use self::query::Kind;
+
 #[derive(Clone, Debug, PartialEq, Queryable, Identifiable, AsChangeset)]
 #[table_name = "timeline_definition"]
 pub struct Timeline {
@@ -119,7 +119,7 @@ impl Timeline {
                         }
                     })
             {
-                return Err(err);
+                Err(err)?;
             }
         }
         Self::insert(
@@ -157,7 +157,7 @@ impl Timeline {
                         }
                     })
             {
-                return Err(err);
+                Err(err)?;
             }
         }
         Self::insert(
@@ -208,7 +208,7 @@ impl Timeline {
             .map_err(Error::from)
     }
 
-    pub fn add_to_all_timelines(rocket: &PlumeRocket, post: &Post, kind: Kind<'_>) -> Result<()> {
+    pub fn add_to_all_timelines(rocket: &PlumeRocket, post: &Post, kind: Kind) -> Result<()> {
         let timelines = timeline_definition::table
             .load::<Self>(rocket.conn.deref())
             .map_err(Error::from)?;
@@ -231,7 +231,7 @@ impl Timeline {
         Ok(())
     }
 
-    pub fn matches(&self, rocket: &PlumeRocket, post: &Post, kind: Kind<'_>) -> Result<bool> {
+    pub fn matches(&self, rocket: &PlumeRocket, post: &Post, kind: Kind) -> Result<bool> {
         let query = TimelineQuery::parse(&self.query)?;
         query.matches(rocket, self, post, kind)
     }
@@ -240,18 +240,16 @@ impl Timeline {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
+    use blogs::tests as blogTests;
-        blogs::tests as blogTests,
-        follows::*,
-        lists::ListType,
-        post_authors::{NewPostAuthor, PostAuthor},
-        posts::NewPost,
-        safe_string::SafeString,
-        tags::Tag,
-        tests::{db, rockets},
-        users::tests as userTests,
-    };
     use diesel::Connection;
+    use follows::*;
+    use lists::ListType;
+    use post_authors::{NewPostAuthor, PostAuthor};
+    use posts::NewPost;
+    use safe_string::SafeString;
+    use tags::Tag;
+    use tests::{db, rockets};
+    use users::tests as userTests;
 
     #[test]
     fn test_timeline() {

plume-models/src/timeline/query.rs

@@ -1,15 +1,15 @@
-use crate::{
+use blogs::Blog;
-    blogs::Blog,
+use lists::{self, ListType};
-    lists::{self, ListType},
-    posts::Post,
-    tags::Tag,
-    timeline::Timeline,
-    users::User,
-    PlumeRocket, Result,
-};
 use plume_common::activity_pub::inbox::AsActor;
+use posts::Post;
+use tags::Tag;
+use users::User;
 use whatlang::{self, Lang};
 
+use {PlumeRocket, Result};
+
+use super::Timeline;
+
 #[derive(Debug, Clone, PartialEq)]
 pub enum QueryError {
     SyntaxError(usize, usize, String),
@@ -65,7 +65,7 @@ impl<'a> Token<'a> {
         }
     }
 
-    fn get_error<T>(&self, token: Token<'_>) -> QueryResult<T> {
+    fn get_error<T>(&self, token: Token) -> QueryResult<T> {
         let (b, e) = self.get_pos();
         let message = format!(
             "Syntax Error: Expected {}, got {}",
@@ -79,7 +79,7 @@ impl<'a> Token<'a> {
 impl<'a> ToString for Token<'a> {
     fn to_string(&self) -> String {
         if let Token::Word(0, 0, v) = self {
-            return (*v).to_string();
+            return v.to_string();
         }
         format!(
             "'{}'",
@@ -127,7 +127,7 @@ macro_rules! gen_tokenizer {
     }
 }
 
-fn lex(stream: &str) -> Vec<Token<'_>> {
+fn lex(stream: &str) -> Vec<Token> {
     stream
         .chars()
         .chain(" ".chars()) // force a last whitespace to empty scan's state
@@ -163,7 +163,7 @@ impl<'a> TQ<'a> {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         match self {
             TQ::Or(inner) => inner.iter().try_fold(false, |s, e| {
@@ -181,7 +181,7 @@ impl<'a> TQ<'a> {
             TQ::Or(inner) => inner.iter().flat_map(TQ::list_used_lists).collect(),
             TQ::And(inner) => inner.iter().flat_map(TQ::list_used_lists).collect(),
             TQ::Arg(Arg::In(typ, List::List(name)), _) => vec![(
-                (*name).to_string(),
+                name.to_string(),
                 match typ {
                     WithList::Blog => ListType::Blog,
                     WithList::Author { .. } => ListType::User,
@@ -208,7 +208,7 @@ impl<'a> Arg<'a> {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         match self {
             Arg::In(t, l) => t.matches(rocket, timeline, post, l, kind),
@@ -233,8 +233,8 @@ impl WithList {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        list: &List<'_>,
+        list: &List,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         match list {
             List::List(name) => {
@@ -290,8 +290,7 @@ impl WithList {
                     (_, _) => Err(QueryError::RuntimeError(format!(
                         "The list '{}' is of the wrong type for this usage",
                         name
-                    ))
+                    )))?,
-                    .into()),
                 }
             }
             List::Array(list) => match self {
@@ -374,7 +373,7 @@ impl Bool {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         match self {
             Bool::Followed { boosts, likes } => {
@@ -645,7 +644,7 @@ impl<'a> TimelineQuery<'a> {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         self.0.matches(rocket, timeline, post, kind)
     }

plume-models/src/users.rs

@@ -1,9 +1,3 @@
-use crate::{
-    ap_url, blocklisted_emails::BlocklistedEmail, blogs::Blog, db_conn::DbConn, follows::Follow,
-    instance::*, medias::Media, notifications::Notification, post_authors::PostAuthor, posts::Post,
-    safe_string::SafeString, schema::users, search::Searcher, timeline::Timeline, Connection,
-    Error, PlumeRocket, Result, ITEMS_PER_PAGE,
-};
 use activitypub::{
     activity::Delete,
     actor::Person,
@@ -20,15 +14,13 @@ use openssl::{
     rsa::Rsa,
     sign,
 };
-use plume_common::{
+use plume_common::activity_pub::{
-    activity_pub::{
+    ap_accept_header,
-        ap_accept_header,
+    inbox::{AsActor, AsObject, FromId},
-        inbox::{AsActor, AsObject, FromId},
+    sign::{gen_keypair, Signer},
-        sign::{gen_keypair, Signer},
+    ActivityStream, ApSignature, Id, IntoId, PublicKey, PUBLIC_VISIBILITY,
-        ActivityStream, ApSignature, Id, IntoId, PublicKey, PUBLIC_VISIBILITY,
-    },
-    utils,
 };
+use plume_common::utils;
 use reqwest::{
     header::{HeaderValue, ACCEPT},
     ClientBuilder,
@@ -45,6 +37,20 @@ use std::{
 use url::Url;
 use webfinger::*;
 
+use blogs::Blog;
+use db_conn::DbConn;
+use follows::Follow;
+use instance::*;
+use medias::Media;
+use notifications::Notification;
+use post_authors::PostAuthor;
+use posts::Post;
+use safe_string::SafeString;
+use schema::users;
+use search::Searcher;
+use timeline::Timeline;
+use {ap_url, Connection, Error, PlumeRocket, Result, ITEMS_PER_PAGE};
+
 pub type CustomPerson = CustomObject<ApSignature, Person>;
 
 pub enum Role {
@@ -130,7 +136,7 @@ impl User {
     }
 
     pub fn delete(&self, conn: &Connection, searcher: &Searcher) -> Result<()> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
 
         for blog in Blog::find_for_author(conn, self)?
             .iter()
@@ -455,8 +461,8 @@ impl User {
             .collect::<Vec<String>>())
     }
     fn get_activities_count(&self, conn: &Connection) -> i64 {
-        use crate::schema::post_authors;
+        use schema::post_authors;
-        use crate::schema::posts;
+        use schema::posts;
         let posts_by_self = PostAuthor::belonging_to(self).select(post_authors::post_id);
         posts::table
             .filter(posts::published.eq(true))
@@ -470,8 +476,8 @@ impl User {
         conn: &Connection,
         (min, max): (i32, i32),
     ) -> Result<Vec<serde_json::Value>> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
-        use crate::schema::posts;
+        use schema::posts;
         let posts_by_self = PostAuthor::belonging_to(self).select(post_authors::post_id);
         let posts = posts::table
             .filter(posts::published.eq(true))
@@ -491,7 +497,7 @@ impl User {
     }
 
     pub fn get_followers(&self, conn: &Connection) -> Result<Vec<User>> {
-        use crate::schema::follows;
+        use schema::follows;
         let follows = Follow::belonging_to(self).select(follows::follower_id);
         users::table
             .filter(users::id.eq_any(follows))
@@ -500,7 +506,7 @@ impl User {
     }
 
     pub fn count_followers(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::follows;
+        use schema::follows;
         let follows = Follow::belonging_to(self).select(follows::follower_id);
         users::table
             .filter(users::id.eq_any(follows))
@@ -514,7 +520,7 @@ impl User {
         conn: &Connection,
         (min, max): (i32, i32),
     ) -> Result<Vec<User>> {
-        use crate::schema::follows;
+        use schema::follows;
         let follows = Follow::belonging_to(self).select(follows::follower_id);
         users::table
             .filter(users::id.eq_any(follows))
@@ -525,7 +531,7 @@ impl User {
     }
 
     pub fn get_followed(&self, conn: &Connection) -> Result<Vec<User>> {
-        use crate::schema::follows::dsl::*;
+        use schema::follows::dsl::*;
         let f = follows.filter(follower_id.eq(self.id)).select(following_id);
         users::table
             .filter(users::id.eq_any(f))
@@ -534,7 +540,7 @@ impl User {
     }
 
     pub fn count_followed(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::follows;
+        use schema::follows;
         follows::table
             .filter(follows::follower_id.eq(self.id))
             .count()
@@ -547,7 +553,7 @@ impl User {
         conn: &Connection,
         (min, max): (i32, i32),
     ) -> Result<Vec<User>> {
-        use crate::schema::follows;
+        use schema::follows;
         let follows = follows::table
             .filter(follows::follower_id.eq(self.id))
             .select(follows::following_id)
@@ -560,7 +566,7 @@ impl User {
     }
 
     pub fn is_followed_by(&self, conn: &Connection, other_id: i32) -> Result<bool> {
-        use crate::schema::follows;
+        use schema::follows;
         follows::table
             .filter(follows::follower_id.eq(other_id))
             .filter(follows::following_id.eq(self.id))
@@ -571,7 +577,7 @@ impl User {
     }
 
     pub fn is_following(&self, conn: &Connection, other_id: i32) -> Result<bool> {
-        use crate::schema::follows;
+        use schema::follows;
         follows::table
             .filter(follows::follower_id.eq(self.id))
             .filter(follows::following_id.eq(other_id))
@@ -582,7 +588,7 @@ impl User {
     }
 
     pub fn has_liked(&self, conn: &Connection, post: &Post) -> Result<bool> {
-        use crate::schema::likes;
+        use schema::likes;
         likes::table
             .filter(likes::post_id.eq(post.id))
             .filter(likes::user_id.eq(self.id))
@@ -593,7 +599,7 @@ impl User {
     }
 
     pub fn has_reshared(&self, conn: &Connection, post: &Post) -> Result<bool> {
-        use crate::schema::reshares;
+        use schema::reshares;
         reshares::table
             .filter(reshares::post_id.eq(post.id))
             .filter(reshares::user_id.eq(self.id))
@@ -604,7 +610,7 @@ impl User {
     }
 
     pub fn is_author_in(&self, conn: &Connection, blog: &Blog) -> Result<bool> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
         blog_authors::table
             .filter(blog_authors::author_id.eq(self.id))
             .filter(blog_authors::blog_id.eq(blog.id))
@@ -804,7 +810,7 @@ impl<'a, 'r> FromRequest<'a, 'r> for User {
 
 impl IntoId for User {
     fn into_id(self) -> Id {
-        Id::new(self.ap_url)
+        Id::new(self.ap_url.clone())
     }
 }
 
@@ -986,10 +992,6 @@ impl NewUser {
     ) -> Result<User> {
         let (pub_key, priv_key) = gen_keypair();
         let instance = Instance::get_local()?;
-        let blocklisted = BlocklistedEmail::matches_blocklist(conn, &email)?;
-        if let Some(x) = blocklisted {
-            return Err(Error::Blocklisted(x.notify_user, x.notification_text));
-        }
 
         let res = User::insert(
             conn,
@@ -1024,13 +1026,11 @@ impl NewUser {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{
-        instance::{tests as instance_tests, Instance},
-        search::tests::get_searcher,
-        tests::{db, rockets},
-        Connection as Conn,
-    };
     use diesel::Connection;
+    use instance::{tests as instance_tests, Instance};
+    use search::tests::get_searcher;
+    use tests::{db, rockets};
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> Vec<User> {
         instance_tests::fill_database(conn);

plume-models/tests/lib.rs

@@ -1,3 +1,7 @@
+extern crate diesel;
+extern crate plume_common;
+extern crate plume_models;
+
 use diesel::Connection;
 use plume_common::utils::random_hex;
 use plume_models::migrations::IMPORTED_MIGRATIONS;

po/plume-front/af.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 19:54\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Afrikaans\n"
 "Language: af_ZA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: af\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/ar.po

@@ -3,55 +3,57 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 19:54\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ar\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "فتح محرر النصوص الغني"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "العنوان"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
 msgstr "العنوان الثانوي أو الملخص"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "اكتب مقالك هنا. ماركداون مُدَعَّم."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "يتبقا {} حرفا تقريبا"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "الوسوم"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "الرخصة"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "الغلاف"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "هذه مسودة"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "نشر كتابا"
-

po/plume-front/bg.po

@@ -3,55 +3,55 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: bg\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Отворете редактора с богат текст"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
-msgstr "Заглавие"
+msgstr ""
 
 # plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
-msgstr "Подзаглавие или резюме"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Напишете статията си тук. Поддържа се Markdown."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "Остават {} знака вляво"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Етикети"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "Лиценз"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Основно изображение"
+msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "Това е проект"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Публикувай"
+msgstr ""
-

po/plume-front/ca.po

@@ -3,55 +3,55 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Catalan\n"
 "Language: ca_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ca\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Obre l’editor de text enriquit"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
-msgstr "Títol"
+msgstr ""
 
 # plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
-msgstr "Subtítol o resum"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Escriviu el vostre article ací. Podeu fer servir el Markdown."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "Queden uns {} caràcters"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Etiquetes"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "Llicència"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Coberta"
+msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "Açò és un esborrany"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Publica"
+msgstr ""
-

po/plume-front/cs.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: cs\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Otevřít editor formátovaného textu"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Nadpis"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
 msgstr "Podnadpis, nebo shrnutí"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Sem napište svůj článek. Markdown je podporován."
+msgstr "Napište sem svůj článek. Markdown je podporován."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Zbývá kolem {} znaků"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Tagy"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licence"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Titulka"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Tohle je koncept"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Zveřejnit"
-

po/plume-front/da.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: da\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/de.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: de\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr " Rich Text Editor (RTE) öffnen"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titel"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "Untertitel oder Zusammenfassung"
+msgstr "Untertitel oder Übersicht"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Schreiben  deinen Artikel hier. Markdown wird unterstützt."
+msgstr "Schreibe deinen Artikel hier. Markdown ist unterstützt."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Ungefähr {} Zeichen übrig"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Schlagwörter"
+msgstr "Tags"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Lizenz"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Einband"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Dies ist ein Entwurf"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Veröffentlichen"
-

po/plume-front/el.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: el\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/en.po

@@ -3,23 +3,24 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: English\n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: en\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
@@ -27,31 +28,30 @@ msgstr ""
 msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
-

po/plume-front/eo.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Esperanto\n"
 "Language: eo_UY\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: eo\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Malfermi la riĉan redaktilon"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titolo"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Subtitolo aŭ resumo"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Verku vian artikolon ĉi tie. Markdown estas subtenita."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Proksimume {} signoj restantaj"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etikedoj"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Permesilo"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Kovro"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Malfinias"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Eldoni"
-

po/plume-front/es.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: es-ES\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Abrir el editor de texto enriquecido"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Título"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Subtítulo o resumen"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Escriba su artículo aquí. Puede utilizar Markdown."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Quedan unos {} caracteres"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etiquetas"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licencia"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Cubierta"
+msgstr "Cobertura"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Esto es un borrador"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publicar"
-

po/plume-front/fa.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: fa\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "باز کردن ویرایش‌گر غنی"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
-msgstr "عنوان"
+msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
-msgstr "زیرعنوان، یا چکیده"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "مقاله را اینجا بنویسید. از مارک‌داون پشتیبانی می‌شود."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "نزدیک به {} نویسه باقی مانده است"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "برچسب‌ها"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "پروانه"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "این، یک پیش‌نویس است"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "انتشار"
+msgstr ""
 

po/plume-front/fi.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: fi\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Avaa edistynyt tekstieditori"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
-msgstr "Otsikko"
+msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
-msgstr "Alaotsikko tai tiivistelmä"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Kirjoita artikkelisi tähän. Markdown -kuvauskieli on tuettu."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "%{count} merkkiä jäljellä"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Tagit"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "Lisenssi"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Kansi"
+msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "Tämä on luonnos"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Julkaise"
+msgstr ""
 

po/plume-front/fr.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: fr\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Ouvrir l'éditeur de texte avancé"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titre"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
 msgstr "Sous-titre ou résumé"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Écrivez votre article ici. Vous pouvez utiliser du Markdown."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Environ {} caractères restant"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Étiquettes"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licence"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Illustration"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Ceci est un brouillon"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publier"
-

po/plume-front/gl.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Galician\n"
 "Language: gl_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: gl\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Abra o editor de texto enriquecido"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Título"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "Subtítulo, ou resumo"
+msgstr "Subtítulo ou resumo"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Escriba aquí o seu artigo: pode utilizar Markdown."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Dispón de {} caracteres restantes"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etiquetas"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenza"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Portada"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Este é un borrador"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publicar"
-

po/plume-front/he.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: he\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/hi.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Hindi\n"
 "Language: hi_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: hi\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "शीर्षक"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "उपशीर्षक या सारांश"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "अपना आर्टिकल या लेख यहाँ लिखें. Markdown उपलब्ध है."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "लगभग {} अक्षर बाकी हैं"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "टैग्स"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "लाइसेंस"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "पब्लिश करें"
-

po/plume-front/hr.po

@@ -3,55 +3,57 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: hr\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Naslov"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Podnaslov ili sažetak"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Tagovi"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenca"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Objavi"
-

po/plume-front/hu.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: hu\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/it.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: it\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Apri il compositore di testo avanzato"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titolo"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "Sottotitolo, o sommario"
+msgstr "Sottotitolo o sommario"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Scrivi qui il tuo articolo. È supportato il Markdown."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Circa {} caratteri rimasti"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etichette"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenza"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Copertina"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Questa è una bozza"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Pubblica"
-

po/plume-front/ja.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ja\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "リッチテキストエディターを開く"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "タイトル"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "サブタイトル、または概要"
+msgstr "サブタイトルまたは概要"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "投稿をここに書きます。Markdown がサポートされています。"
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "残り約 {} 文字"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "タグ"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "ライセンス"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "カバー"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "これは下書きです"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "公開"
-

po/plume-front/ko.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ko\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/nl.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: nl\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/no.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Norwegian\n"
 "Language: no_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: no\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/pl.po

@@ -3,55 +3,57 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
+"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
+"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: pl\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Otwórz edytor tekstu sformatowanego"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Tytuł"
 
 # plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
-msgstr "Podtytuł, lub podsumowanie"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Napisz swój artykuł tutaj. Markdown jest obsługiwany."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Pozostało w okolicy {} znaków"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Tagi"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licencja"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Okładka"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "To jest szkic"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Publikuj"
+msgstr "Opublikuj"
-

po/plume-front/pt.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-18 07:05\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
-"Language-Team: Portuguese, Brazilian\n"
+"Language-Team: Portuguese\n"
-"Language: pt_BR\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Language: pt-BR\n"
+"X-Crowdin-Language: pt-PT\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Abrir o editor de rich text"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Título"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "Subtítulo ou resumo"
+msgstr "Legenda ou resumo"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Escreva seu artigo aqui. Markdown é suportado."
+msgstr "Escreva seu artigo aqui. Markdown pode ser usado."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Cerca de {} caracteres restantes"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Tags"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licença"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Capa"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Isso é um rascunho"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publicar"
-

po/plume-front/ro.po

@@ -3,55 +3,57 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Romanian\n"
 "Language: ro_RO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100>0 && n%100<20)) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100>0 && n"
+"%100<20)) ? 1 : 2);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ro\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Deschide editorul de text"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titlu"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Subtitlu sau rezumat"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Scrie articolul tău aici. Markdown este acceptat."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "În apropiere de {} caractere rămase"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etichete"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenţă"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Coperta"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Aceasta este o ciornă"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publică"
-

po/plume-front/ru.po

@@ -3,23 +3,26 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
+"Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 "
+"&& n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 "
+"&& n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ru\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
@@ -27,31 +30,30 @@ msgstr ""
 msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
-

po/plume-front/sk.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: sk\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Otvor editor formátovaného textu"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Nadpis"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
 msgstr "Zhrnutie, alebo podnadpis"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Tu napíš svoj článok. Markdown je podporovaný."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Zostáva asi {} znakov"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Štítky"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licencia"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Obálka"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Toto je koncept"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Zverejniť"
-

po/plume-front/sl.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: sl\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Naslov"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Oznake"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenca"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "To je osnutek"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Objavi"
 

po/plume-front/sr.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 20:49\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Serbian (Latin)\n"
 "Language: sr_CS\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: sr-CS\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Otvori uređivač sa stilizacijom"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Naslov"
 
 # plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
-msgstr "Podnaslov, ili sažetak"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Napišite vaš članak ovde. Na raspolaganju vam je Markdown."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "Preostalo oko {} znakova"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Markeri"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "Licenca"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Naslovna strana"
+msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "Ovo je nacrt"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Objavi"
+msgstr ""
-

po/plume-front/sv.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: sv-SE\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titel"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Undertitel eller sammanfattning"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Skriv din artikel här. Markdown stöds."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Ungefär {} karaktärer kvar"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Taggar"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licens"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Omslag"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publicera"
-

po/plume-front/tr.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: tr\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Zengin metin editörünü (RTE) aç"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
-msgstr "Başlık"
+msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
-msgstr "Alt başlık, veya açıklama"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Makaleni buraya yaz. Markdown kullanabilirsin."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "Yaklaşık {} karakter kaldı"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Etiketler"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "Lisans"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Kapak"
+msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "Bu bir taslaktır"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Yayınla"
+msgstr ""
 

po/plume-front/uk.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: uk\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/vi.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: vi\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Văn bản của tôi"
-
-# plume-front/src/editor.rs:145
-msgid "Title"
-msgstr "Tiêu Châu"
-
-# plume-front/src/editor.rs:149
-msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:143
+msgid "Title"
+msgstr ""
+
+# plume-front/src/editor.rs:147
+msgid "Subtitle or summary"
+msgstr ""
+
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/zh.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: zh-CN\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume/ar.po

@@ -3,99 +3,102 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 20:49\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ar\n"
 "X-Crowdin-File: /master/po/plume/plume.pot\n"
 
-# src/template_utils.rs:102
+# src/template_utils.rs:68
 msgid "{0} commented on your article."
-msgstr "علّق {0} على مقالك."
+msgstr ""
 
-# src/template_utils.rs:103
+# src/template_utils.rs:69
 msgid "{0} is subscribed to you."
-msgstr "{0} مشترك لك."
+msgstr ""
 
-# src/template_utils.rs:104
+# src/template_utils.rs:70
 msgid "{0} liked your article."
-msgstr "{0} أعجبهم مقالك."
+msgstr ""
 
-# src/template_utils.rs:105
+# src/template_utils.rs:71
 msgid "{0} mentioned you."
 msgstr "أشار إليك {0}."
 
-# src/template_utils.rs:106
+# src/template_utils.rs:72
 msgid "{0} boosted your article."
-msgstr "{0} دعمو مقالك."
+msgstr ""
 
-# src/template_utils.rs:142
+# src/template_utils.rs:108
 msgid "{0}'s avatar"
 msgstr "الصورة الرمزية لـ {0}"
 
-# src/routes/blogs.rs:64
+# src/routes/blogs.rs:70
 msgid "To create a new blog, you need to be logged in"
 msgstr "لإنشاء مدونة جديدة، تحتاج إلى تسجيل الدخول"
 
-# src/routes/blogs.rs:106
+# src/routes/blogs.rs:109
 msgid "A blog with the same name already exists."
-msgstr "توجد مدونة تحمل نفس العنوان."
+msgstr ""
 
-# src/routes/blogs.rs:141
+# src/routes/session.rs:259
+#, fuzzy
 msgid "Your blog was successfully created!"
-msgstr "تم إنشاء مدونتك بنجاح!"
+msgstr "تمت إعادة تعيين كلمتك السرية بنجاح."
 
-# src/routes/blogs.rs:163
+# src/routes/blogs.rs:167
 msgid "Your blog was deleted."
-msgstr "تم حذف مدونتك."
+msgstr ""
 
-# src/routes/blogs.rs:170
+# src/routes/blogs.rs:172
 msgid "You are not allowed to delete this blog."
 msgstr "لا يسمح لك بحذف هذه المدونة."
 
-# src/routes/blogs.rs:218
+# src/routes/blogs.rs:217
 msgid "You are not allowed to edit this blog."
 msgstr "لا يسمح لك بتعديل هذه المدونة."
 
-# src/routes/blogs.rs:263
+# src/routes/blogs.rs:262
 msgid "You can't use this media as a blog icon."
 msgstr "لا يمكنك استخدام هذه الوسائط كأيقونة للمدونة."
 
-# src/routes/blogs.rs:281
+# src/routes/blogs.rs:280
 msgid "You can't use this media as a blog banner."
 msgstr "لا يمكنك استخدام هذه الوسائط كشعار للمدونة."
 
-# src/routes/blogs.rs:314
+# src/routes/blogs.rs:312
 msgid "Your blog information have been updated."
-msgstr "تم تحديث معلومات مُدوّنتك."
+msgstr ""
 
-# src/routes/comments.rs:97
+#, fuzzy
 msgid "Your comment has been posted."
-msgstr "تم نشر تعليقك."
+msgstr "ليس لديك أية وسائط بعد."
 
-# src/routes/comments.rs:172
+#, fuzzy
 msgid "Your comment has been deleted."
-msgstr "تم حذف تعليقك."
+msgstr "ليس لديك أية وسائط بعد."
 
-# src/routes/instance.rs:134
+# src/routes/instance.rs:145
 msgid "Instance settings have been saved."
-msgstr "تم حفظ إعدادات المثيل."
+msgstr ""
 
-# src/routes/instance.rs:175
+# src/routes/instance.rs:182
 msgid "{} have been unblocked."
 msgstr ""
 
-# src/routes/instance.rs:177
+# src/routes/instance.rs:184
 msgid "{} have been blocked."
 msgstr ""
 
-# src/routes/instance.rs:221
+# src/routes/instance.rs:218
 msgid "{} have been banned."
 msgstr ""
 
@@ -103,23 +106,25 @@ msgstr ""
 msgid "To like a post, you need to be logged in"
 msgstr "يجب عليك تسجيل الدخول أولا للإعجاب بهذا المقال"
 
-# src/routes/medias.rs:141
+# src/routes/medias.rs:143
 msgid "Your media have been deleted."
-msgstr "لقد تم حذف وسائطك."
+msgstr ""
 
-# src/routes/medias.rs:146
+# src/routes/blogs.rs:172
+#, fuzzy
 msgid "You are not allowed to delete this media."
-msgstr "لا يسمح لك بحذف هذه الوسائط."
+msgstr "لا يسمح لك بحذف هذه المدونة."
 
-# src/routes/medias.rs:163
+#, fuzzy
 msgid "Your avatar has been updated."
-msgstr "تم تحديث صورتك الشخصية."
+msgstr "ليس لديك أية وسائط بعد."
 
-# src/routes/medias.rs:168
+# src/routes/blogs.rs:217
+#, fuzzy
 msgid "You are not allowed to use this media."
-msgstr "لا يسمح لك باستعمال هذه الوسائط."
+msgstr "لا يسمح لك بتعديل هذه المدونة."
 
-# src/routes/notifications.rs:28
+# src/routes/notifications.rs:29
 msgid "To see your notifications, you need to be logged in"
 msgstr "يجب عليك تسجيل الدخول أولا لعرض الإشعارات"
 
@@ -131,77 +136,82 @@ msgstr "هذا المقال ليس منشورا بعد."
 msgid "To write a new post, you need to be logged in"
 msgstr "يجب عليك تسجيل الدخول أولا لكتابة مقال جديد"
 
-# src/routes/posts.rs:139
+# src/routes/posts.rs:140
 msgid "You are not an author of this blog."
 msgstr "لست مِن محرري هذه المدونة."
 
-# src/routes/posts.rs:146
+# src/routes/posts.rs:147
 msgid "New post"
 msgstr "منشور جديد"
 
-# src/routes/posts.rs:191
+# src/routes/posts.rs:192
 msgid "Edit {0}"
 msgstr "تعديل {0}"
 
-# src/routes/posts.rs:260
+# src/routes/blogs.rs:217
+#, fuzzy
 msgid "You are not allowed to publish on this blog."
-msgstr "لا يسمح لك بالنشر على هذه المدونة."
+msgstr "لا يسمح لك بتعديل هذه المدونة."
 
-# src/routes/posts.rs:350
+#, fuzzy
 msgid "Your article has been updated."
-msgstr "تم تحديث مقالك."
+msgstr "ليس لديك أية وسائط بعد."
 
-# src/routes/posts.rs:532
+#, fuzzy
 msgid "Your article has been saved."
-msgstr "تم حفظ مقالك."
+msgstr "ليس لديك أية وسائط بعد."
 
-# src/routes/posts.rs:538
 msgid "New article"
 msgstr "مقال جديد"
 
-# src/routes/posts.rs:572
+# src/routes/blogs.rs:172
+#, fuzzy
 msgid "You are not allowed to delete this article."
-msgstr "لا يسمح لك بحذف هذا المقال."
+msgstr "لا يسمح لك بحذف هذه المدونة."
 
-# src/routes/posts.rs:597
+#, fuzzy
 msgid "Your article has been deleted."
-msgstr "تم حذف مقالك."
+msgstr "ليس لديك أية وسائط بعد."
 
-# src/routes/posts.rs:602
+# src/routes/posts.rs:593
-msgid "It looks like the article you tried to delete doesn't exist. Maybe it is already gone?"
+msgid ""
-msgstr "لم يتم العثور على المقال الذي تحاول حذفه. ربما سبق حذفه؟"
+"It looks like the article you tried to delete doesn't exist. Maybe it is "
+"already gone?"
+msgstr ""
 
-# src/routes/posts.rs:642
+# src/routes/posts.rs:630
-msgid "Couldn't obtain enough information about your account. Please make sure your username is correct."
+msgid ""
-msgstr "تعذر العثور عن معلومات حسابك. المرجو التحقق من صحة إسم المستخدم."
+"Couldn't obtain enough information about your account. Please make sure your "
+"username is correct."
+msgstr ""
 
 # src/routes/reshares.rs:51
 msgid "To reshare a post, you need to be logged in"
-msgstr "يجب عليك تسجيل الدخول أولا للإعادت نشر هذا المقال"
+msgstr ""
 
-# src/routes/session.rs:112
+#, fuzzy
 msgid "You are now connected."
-msgstr "أنت الآن متصل."
+msgstr "ليست لديك التصريحات اللازمة للقيام بذلك."
 
-# src/routes/session.rs:131
+#, fuzzy
 msgid "You are now logged off."
-msgstr "لقد قمتَ بالخروج للتوّ."
+msgstr "ليست لديك التصريحات اللازمة للقيام بذلك."
 
-# src/routes/session.rs:188
+# src/routes/session.rs:181
 msgid "Password reset"
 msgstr "إعادة تعيين كلمة المرور"
 
-# src/routes/session.rs:189
+# src/routes/session.rs:182
 msgid "Here is the link to reset your password: {0}"
 msgstr "ها هو رابط إعادة تعيين كلمتك السرية: {0}"
 
-# src/routes/session.rs:264
+# src/routes/session.rs:259
 msgid "Your password was successfully reset."
 msgstr "تمت إعادة تعيين كلمتك السرية بنجاح."
 
-# src/routes/session.rs:274
+# src/routes/session.rs:263
 msgid "Sorry, but the link expired. Try again"
-msgstr ""
+msgstr "عذراً، ولكن انتهت مدة صلاحية الرابط. حاول مرة أخرى"
 
 # src/routes/user.rs:136
 msgid "To access your dashboard, you need to be logged in"
@@ -209,39 +219,41 @@ msgstr "يجب عليك تسجيل الدخول أولاللنفاذ إلى لو
 
 # src/routes/user.rs:158
 msgid "You are no longer following {}."
-msgstr "أنت لم تعد تتابع {}."
+msgstr ""
 
-# src/routes/user.rs:175
+# src/routes/user.rs:174
 msgid "You are now following {}."
-msgstr "أنت الآن تتابع {}."
+msgstr ""
 
-# src/routes/user.rs:254
+# src/routes/user.rs:244
 msgid "To subscribe to someone, you need to be logged in"
-msgstr "للإشتراك بأحد ما، يجب تسجيل الدخول أولا"
+msgstr ""
 
-# src/routes/user.rs:356
+# src/routes/user.rs:344
 msgid "To edit your profile, you need to be logged in"
-msgstr "لتعديل الحساب، يجب تسجيل الدخول أولا"
+msgstr ""
 
-# src/routes/user.rs:398
+#, fuzzy
 msgid "Your profile has been updated."
-msgstr "تم تحديث ملفك الشخصي."
+msgstr "ليس لديك أية وسائط بعد."
 
-# src/routes/user.rs:425
+#, fuzzy
 msgid "Your account has been deleted."
-msgstr "تم حذف حسابك."
+msgstr "ليس لديك أية وسائط بعد."
 
-# src/routes/user.rs:431
+# src/routes/user.rs:411
 msgid "You can't delete someone else's account."
-msgstr "لا يمكنك حذف حساب شخص آخر."
+msgstr ""
 
-# src/routes/user.rs:503
+# src/routes/user.rs:473
 msgid "Registrations are closed on this instance."
-msgstr "التسجيلات مُغلقة على مثيل الخادم هذ."
+msgstr ""
 
 # src/routes/user.rs:527
-msgid "Your account has been created. Now you just need to log in, before you can use it."
+msgid ""
-msgstr "لقد تم إنشاء حسابك. ما عليك إلّا الولوج الآن للتمكّن مِن استعماله."
+"Your account has been created. Now you just need to log in, before you can "
+"use it."
+msgstr ""
 
 msgid "Internal server error"
 msgstr "خطأ داخلي في الخادم"
@@ -265,22 +277,25 @@ msgid "The link that led you here may be broken."
 msgstr "مِن المشتبه أنك قد قمت باتباع رابط غير صالح."
 
 msgid "The content you sent can't be processed."
-msgstr "لا يمكن معالجة المحتوى الذي قمت بإرساله."
+msgstr ""
 
 msgid "Maybe it was too long."
-msgstr "ربما كان طويلا جدا."
+msgstr ""
 
 msgid "Invalid CSRF token"
-msgstr "الرمز المميز CSRF غير صالح"
+msgstr ""
 
-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."
+msgid ""
-msgstr "هناكخطأم ما في رمز CSRF. تحقق أن الكوكيز مفعل في متصفحك وأعد تحميل الصفحة. إذا واجهتهذا الخطأ منجديد يرجى التبليغ."
+"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 "Articles tagged \"{0}\""
 msgstr "المقالات الموسومة بـ \"{0}\""
 
 msgid "There are currently no articles with such a tag"
-msgstr "لا يوجد حالي أي مقال بهذا الوسام"
+msgstr ""
 
 msgid "New Blog"
 msgstr "مدونة جديدة"
@@ -288,11 +303,10 @@ msgstr "مدونة جديدة"
 msgid "Create a blog"
 msgstr "انشئ مدونة"
 
-# src/template_utils.rs:251
 msgid "Title"
 msgstr "العنوان"
 
-# src/template_utils.rs:254
+# src/template_utils.rs:220
 msgid "Optional"
 msgstr "اختياري"
 
@@ -306,10 +320,11 @@ msgid "Description"
 msgstr "الوصف"
 
 msgid "Markdown syntax is supported"
-msgstr "صياغت ماركداون مدعمة"
+msgstr ""
 
-msgid "You can upload images to your gallery, to use them as blog icons, or banners."
+msgid ""
-msgstr "يمكن رفع الصور إلى ألبومك من أجل إستعمالها كأيقونة المدونة أو الشعار."
+"You can upload images to your gallery, to use them as blog icons, or banners."
+msgstr ""
 
 msgid "Upload images"
 msgstr "رفع صور"
@@ -340,12 +355,12 @@ msgstr "تعديل"
 
 msgid "There's one author on this blog: "
 msgid_plural "There are {0} authors on this blog: "
-msgstr[0] "ليس هنالك مؤلف في هذه المدونة : "
+msgstr[0] ""
-msgstr[1] "هنالك مؤلف واحد في هذه المدونة :"
+msgstr[1] ""
-msgstr[2] "هنالك مؤلفين إثنين في هءه المدونة :"
+msgstr[2] ""
-msgstr[3] "هنالك {0} مؤلفين في هذه المدونة :"
+msgstr[3] ""
-msgstr[4] "هنالك {0} مؤلفون في هذه المدونة :"
+msgstr[4] ""
-msgstr[5] "هنلك {0} مؤلفون في هذه المدونة: "
+msgstr[5] ""
 
 msgid "Latest articles"
 msgstr "آخر المقالات"
@@ -353,132 +368,139 @@ msgstr "آخر المقالات"
 msgid "No posts to see here yet."
 msgstr "في الوقت الراهن لا توجد أية منشورات هنا."
 
+#, fuzzy
 msgid "Search result(s) for \"{0}\""
-msgstr "نتائج البحث عن \"{0}\""
+msgstr "نتائج البحث"
 
+#, fuzzy
 msgid "Search result(s)"
 msgstr "نتائج البحث"
 
+#, fuzzy
 msgid "No results for your query"
-msgstr "لا توجد نتيجة لطلبك"
+msgstr "الانتقال إلى معرضك"
 
 msgid "No more results for your query"
-msgstr "لم تتبقى نتائج لطلبك"
+msgstr ""
 
 msgid "Search"
 msgstr "البحث"
 
 msgid "Your query"
-msgstr ""
+msgstr "طلبُك"
 
 msgid "Advanced search"
 msgstr "البحث المتقدم"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "Article title matching these words"
 msgstr "عنوان المقالات المطابقة لهذه الكلمات"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "Subtitle matching these words"
 msgstr "العناوين الثانوية للمقالات المطابقة لهذه الكلمات"
 
 msgid "Subtitle - byline"
 msgstr ""
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "Content matching these words"
 msgstr ""
 
 msgid "Body content"
 msgstr "محتوى العرض"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "From this date"
 msgstr "اعتبارا من هذا التاريخ"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "To this date"
-msgstr ""
+msgstr "بحلول هذا التاريخ"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "Containing these tags"
 msgstr "تتضمن هذه الوسوم"
 
 msgid "Tags"
 msgstr "الوسوم"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "Posted on one of these instances"
-msgstr "نُشر في واحدة من هاته المثائل"
+msgstr ""
 
 msgid "Instance domain"
 msgstr "اسم نطاق مثيل الخادم"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "Posted by one of these authors"
-msgstr "نُشر من طرف واحد من هاؤلاء المؤلفين"
+msgstr ""
 
+#, fuzzy
 msgid "Author(s)"
 msgstr "المؤلفون"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "Posted on one of these blogs"
-msgstr "نُشر في واحدة من هاته المدونات"
+msgstr ""
 
 msgid "Blog title"
 msgstr "عنوان المدونة"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "Written in this language"
-msgstr "كتب في هذه اللغة"
+msgstr ""
 
 msgid "Language"
 msgstr "اللغة"
 
-# src/template_utils.rs:339
+# src/template_utils.rs:305
 msgid "Published under this license"
-msgstr "نشرتحت هذا الترخيص"
+msgstr ""
 
 msgid "Article license"
 msgstr "رخصة المقال"
 
 msgid "Interact with {}"
-msgstr "التفاعل مع {}"
+msgstr ""
 
+#, fuzzy
 msgid "Log in to interact"
-msgstr "قم بتسجيل الدخول قصد التفاعل"
+msgstr "قم بتسجيل الدخول قصد الإعجاب به"
 
 msgid "Enter your full username to interact"
-msgstr "أدخل إسم المستخدم الخاص بك كاملا للتفاعل"
+msgstr ""
 
 msgid "Publish"
 msgstr "انشر"
 
 msgid "Classic editor (any changes will be lost)"
-msgstr "المحرر العادي (ستفقد كل التغيرات)"
+msgstr ""
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Subtitle"
 msgstr "العنوان الثانوي"
 
 msgid "Content"
 msgstr "المحتوى"
 
-msgid "You can upload media to your gallery, and then copy their Markdown code into your articles to insert them."
+msgid ""
-msgstr "يكنك رفع الوسائط للألبوم ومن ثم نسخ شفرة الماركداون في مقالاتك لإدراجها."
+"You can upload media to your gallery, and then copy their Markdown code into "
+"your articles to insert them."
+msgstr ""
 
 msgid "Upload media"
 msgstr "تحميل وسائط"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Tags, separated by commas"
-msgstr "الكلمات الدلالية، مفصولة بفواصل"
+msgstr ""
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "License"
 msgstr "الرخصة"
 
-# src/template_utils.rs:259
+# src/template_utils.rs:225
 msgid "Leave it empty to reserve all rights"
 msgstr ""
 
@@ -516,28 +538,30 @@ msgstr[4] "{0} إعجابات"
 msgstr[5] "{0} إعجابات"
 
 msgid "I don't like this anymore"
-msgstr "لم يعد يعجبني هذا"
+msgstr ""
 
 msgid "Add yours"
 msgstr "أعجبني"
 
 msgid "One boost"
 msgid_plural "{0} boosts"
-msgstr[0] "لم يدعم"
+msgstr[0] ""
-msgstr[1] "دُعِّم مرة واحدة"
+msgstr[1] ""
-msgstr[2] "دُعِم مرتين إثنتين"
+msgstr[2] ""
-msgstr[3] "دُعِّم {0} مرات"
+msgstr[3] ""
-msgstr[4] "دُعِّم {0} مرة"
+msgstr[4] ""
-msgstr[5] "دُعِّم {0} مرة"
+msgstr[5] ""
 
 msgid "I don't want to boost this anymore"
-msgstr "لم أعد أرغب في دعم هذا"
+msgstr ""
 
 msgid "Boost"
 msgstr "رقّي"
 
-msgid "{0}Log in{1}, or {2}use your Fediverse account{3} to interact with this article"
+msgid ""
-msgstr "{0}قم بتسجيل الدخول{1} أو {2}استخدم حسابك على الفديفرس{3} إن كنت ترغب في التفاعل مع هذا المقال"
+"{0}Log in{1}, or {2}use your Fediverse account{3} to interact with this "
+"article"
+msgstr ""
 
 msgid "Unsubscribe"
 msgstr "إلغاء الاشتراك"
@@ -548,7 +572,7 @@ msgstr "إشترِك"
 msgid "Comments"
 msgstr "التعليقات"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Content warning"
 msgstr "تحذير عن المحتوى"
 
@@ -568,10 +592,10 @@ msgid "Delete"
 msgstr "حذف"
 
 msgid "This article is still a draft. Only you and other authors can see it."
-msgstr "لا يزال هذا المقال مجرّد مسودّة. إلّا أنت والمحررون الآخرون يمكنهم رؤيته."
+msgstr ""
 
 msgid "Only you and other authors can edit this article."
-msgstr "إلّا أنت والمحرّرون الآخرون يمكنهم تعديل هذا المقال."
+msgstr ""
 
 msgid "Media upload"
 msgstr "إرسال الوسائط"
@@ -580,7 +604,7 @@ msgid "Useful for visually impaired people, as well as licensing information"
 msgstr "مفيدة للأشخاص المعاقين بصريا، فضلا عن معلومات الترخيص"
 
 msgid "Leave it empty, if none is needed"
-msgstr "إتركه فارغا إن لم تكن في الحاجة"
+msgstr ""
 
 msgid "File"
 msgstr "الملف"
@@ -610,10 +634,10 @@ msgid "Go back to the gallery"
 msgstr "العودة إلى المعرض"
 
 msgid "Markdown syntax"
-msgstr "صياغت ماركداون"
+msgstr ""
 
 msgid "Copy it into your articles, to insert this media:"
-msgstr "قم بنسخه في مقالاتك منأجل إدراج الوسائط:"
+msgstr ""
 
 msgid "Use as an avatar"
 msgstr "استخدمها كصورة رمزية"
@@ -646,13 +670,13 @@ msgid "About this instance"
 msgstr "عن مثيل الخادوم هذا"
 
 msgid "Privacy policy"
-msgstr "سياسة الخصوصية"
+msgstr ""
 
 msgid "Administration"
 msgstr "الإدارة"
 
 msgid "Documentation"
-msgstr "الدليل"
+msgstr ""
 
 msgid "Source code"
 msgstr "الشيفرة المصدرية"
@@ -673,10 +697,10 @@ msgid "Nothing to see here yet. Try subscribing to more people."
 msgstr ""
 
 msgid "Articles from {}"
-msgstr ""
+msgstr "مقالات صادرة مِن {}"
 
 msgid "All the articles of the Fediverse"
-msgstr ""
+msgstr "كافة مقالات الفديفرس"
 
 msgid "Users"
 msgstr "المستخدمون"
@@ -693,7 +717,7 @@ msgstr "اطرد"
 msgid "Administration of {0}"
 msgstr "إدارة {0}"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Name"
 msgstr "الاسم"
 
@@ -701,12 +725,12 @@ msgid "Allow anyone to register here"
 msgstr "السماح للجميع بإنشاء حساب"
 
 msgid "Short description"
-msgstr "وصف مختصر"
+msgstr ""
 
 msgid "Long description"
 msgstr "الوصف الطويل"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Default article license"
 msgstr "الرخصة الافتراضية للمقال"
 
@@ -726,18 +750,26 @@ msgid "Who wrote <em>{0}</em> articles"
 msgstr "قاموا بتحرير <em>{0}</em> مقالات"
 
 msgid "And are connected to <em>{0}</em> other instances"
-msgstr "ومتصل بـ <em>{0}</em> مثيلات خوادم أخرى"
+msgstr ""
 
 msgid "Administred by"
 msgstr "يديره"
 
-msgid "If you are browsing this site as a visitor, no data about you is collected."
+msgid ""
+"If you are browsing this site as a visitor, no data about you is collected."
 msgstr ""
 
-msgid "As a registered user, you have to provide your username (which does not have to be your real name), your functional email address and a password, in order to be able to log in, write articles and comment. The content you submit is stored until you delete it."
+msgid ""
+"As a registered user, you have to provide your username (which does not have "
+"to be your real name), your functional email address and a password, in "
+"order to be able to log in, write articles and comment. The content you "
+"submit is stored until you delete it."
 msgstr ""
 
-msgid "When you log in, we store two cookies, one to keep your session open, the second to prevent other people to act on your behalf. We don't store any other cookies."
+msgid ""
+"When you log in, we store two cookies, one to keep your session open, the "
+"second to prevent other people to act on your behalf. We don't store any "
+"other cookies."
 msgstr ""
 
 msgid "Welcome to {}"
@@ -752,11 +784,11 @@ msgstr "حظر"
 msgid "Reset your password"
 msgstr "أعد تعيين كلمتك السرية"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "New password"
 msgstr "كلمة السر الجديدة"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Confirmation"
 msgstr "تأكيد"
 
@@ -766,26 +798,28 @@ msgstr "تحديث الكلمة السرية"
 msgid "Log in"
 msgstr "تسجيل الدخول"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Username, or email"
 msgstr "اسم المستخدم أو عنوان البريد الالكتروني"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Password"
 msgstr "كلمة السر"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "E-mail"
-msgstr ""
+msgstr "البريد الإلكتروني"
 
 msgid "Send password reset link"
-msgstr "أرسل رابط إعادة تعيين الكلمة السرية"
+msgstr ""
 
 msgid "Check your inbox!"
-msgstr "تحقق من علبة الوارد الخاصة بك!"
+msgstr ""
 
-msgid "We sent a mail to the address you gave us, with a link to reset your password."
+msgid ""
-msgstr "لقد أرسلنا رسالة للعنوان الذي توصلنا به من طرفك تضمنرابط لإعادت تحديد كلمة المرور."
+"We sent a mail to the address you gave us, with a link to reset your "
+"password."
+msgstr ""
 
 msgid "Admin"
 msgstr "المدير"
@@ -799,17 +833,19 @@ msgstr "تعديل ملفك الشخصي"
 msgid "Open on {0}"
 msgstr "افتح على {0}"
 
+#, fuzzy
 msgid "Follow {}"
-msgstr "تابِع {}"
+msgstr "اتبع"
 
+#, fuzzy
 msgid "Log in to follow"
-msgstr "قم بتسجيل الدخول للمتابعة"
+msgstr "قم بتسجيل الدخول قصد مشاركته"
 
 msgid "Enter your full username handle to follow"
-msgstr "اخل اسم مستخدمك كاملا للمتابعة"
+msgstr ""
 
 msgid "{0}'s subscriptions"
-msgstr "{0} اشتراكات"
+msgstr ""
 
 msgid "Articles"
 msgstr "المقالات"
@@ -826,23 +862,25 @@ msgstr "انشئ حسابك"
 msgid "Create an account"
 msgstr "انشئ حسابا"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Username"
 msgstr "اسم المستخدم"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Password confirmation"
+msgstr "تأكيد الكلمة السرية"
+
+msgid ""
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
 msgstr ""
 
-msgid "Apologies, but registrations are closed on this particular instance. You can, however, find a different one."
-msgstr "المعذرة، لاكن التسجيل مغلق في هذا المثيل بالدات. يمكنك إجاد مثيل آخر للتسجيل."
-
 msgid "{0}'s subscribers"
-msgstr "{0} مشتركين"
+msgstr ""
 
 msgid "Edit your account"
 msgstr "تعديل حسابك"
@@ -850,15 +888,16 @@ msgstr "تعديل حسابك"
 msgid "Your Profile"
 msgstr "ملفك الشخصي"
 
-msgid "To change your avatar, upload it to your gallery and then select from there."
+msgid ""
-msgstr "لتغير الصورة التشخيصية قم أولا برفعها إلى الألبوم ثم قم بتعينها من هنالك."
+"To change your avatar, upload it to your gallery and then select from there."
+msgstr ""
 
 msgid "Upload an avatar"
 msgstr "تحميل صورة رمزية"
 
-# src/template_utils.rs:251
+# src/template_utils.rs:217
 msgid "Display name"
-msgstr ""
+msgstr "الاسم المعروض"
 
 msgid "Summary"
 msgstr "الملخص"
@@ -873,7 +912,7 @@ msgid "Delete your account"
 msgstr "احذف حسابك"
 
 msgid "Sorry, but as an admin, you can't leave your own instance."
-msgstr "المعذرة ولاكن كمدير لايمكنك مغادرة مثيلك الخاص."
+msgstr ""
 
 msgid "Your Dashboard"
 msgstr "لوح المراقبة"
@@ -882,7 +921,7 @@ msgid "Your Blogs"
 msgstr "مدوناتك"
 
 msgid "You don't have any blog yet. Create your own, or ask to join one."
-msgstr "ليس لديك أيت مدونة. قم بإنشاء مدونتك أو أطلب الإنظمام لواحدة."
+msgstr ""
 
 msgid "Start a new blog"
 msgstr "انشئ مدونة جديدة"
@@ -906,10 +945,12 @@ msgid "Plume is a decentralized blogging engine."
 msgstr "بلوم محرك لامركزي للمدونات."
 
 msgid "Authors can manage multiple blogs, each as its own website."
-msgstr "يمكن للمحررين أن يديرو العديد من المدونات كل واحدة كموقع منفرد."
+msgstr ""
 
-msgid "Articles are also visible on other Plume instances, and you can interact with them directly from other platforms like Mastodon."
+msgid ""
-msgstr "ستكون المقالات معروضة على مواقع بلومالأخرى حيث يمكنكم التفاعل معها مباشرة عبر أية منصة أخرى مثل ماستدون."
+"Articles are also visible on other Plume instances, and you can interact "
+"with them directly from other platforms like Mastodon."
+msgstr ""
 
 msgid "Read the detailed rules"
 msgstr "إقرأ القواعد بالتفصيل"
@@ -935,16 +976,20 @@ msgstr "رد"
 msgid "Delete this comment"
 msgstr "احذف هذا التعليق"
 
+#, fuzzy
 msgid "I'm from this instance"
-msgstr "أنا أنتمي إلى مثيل الخادم هذا"
+msgstr "عن مثيل الخادوم هذا"
 
 msgid "I'm from another instance"
-msgstr "أنا أنتمي إلى مثيل خادم آخر"
+msgstr ""
 
-# src/template_utils.rs:259
+# src/template_utils.rs:225
 msgid "Example: user@plu.me"
 msgstr ""
 
+#, fuzzy
 msgid "Continue to your instance"
-msgstr "واصل إلى مثيل خادمك"
+msgstr "إعداد مثيل الخادم"
 
+#~ msgid "Delete this article"
+#~ msgstr "احذف هذا المقال"