diff --git a/.gitignore b/.gitignore
index 58a19f09..4756e4c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ tags.*
!tags.rs
search_index
main.css
+*.wasm
+*.js
diff --git a/.travis.yml b/.travis.yml
index b8238289..d1aead71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,9 @@ stages:
- test and coverage
jobs:
include:
+ - stage: build
+ name: "Build front"
+ script: (cargo web -h || cargo install cargo-web) && cd plume-front && cargo web check
- stage: build
name: "Build with postgresql"
env:
@@ -43,7 +46,7 @@ jobs:
before_script: psql -c 'create database plume_tests;' -U postgres
script:
- |
- cargo test --features "${FEATURES}" --no-default-features --all &&
+ cargo test --features "${FEATURES}" --no-default-features --all --exclude plume-front &&
./script/compute_coverage.sh
- stage: test and coverage
name: "Test with Sqlite backend"
@@ -52,5 +55,5 @@ jobs:
- RUSTFLAGS='-C link-dead-code' RUST_TEST_THREADS=1
script:
- |
- cargo test --features "${FEATURES}" --no-default-features --all &&
+ cargo test --features "${FEATURES}" --no-default-features --all --exclude plume-front &&
./script/compute_coverage.sh
diff --git a/Cargo.lock b/Cargo.lock
index dcde0a26..cfb5b731 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,3 +1,11 @@
+[[package]]
+name = "MacTypes-sys"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "activitypub"
version = "0.1.3"
@@ -96,7 +104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "arrayvec"
-version = "0.4.8"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -142,12 +150,17 @@ dependencies = [
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "autocfg"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "backtrace"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"debug-builders 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -158,25 +171,31 @@ dependencies = [
[[package]]
name = "backtrace"
-version = "0.3.12"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "backtrace-sys"
-version = "0.1.24"
+version = "0.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "base-x"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "base64"
version = "0.9.3"
@@ -200,7 +219,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "blowfish 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blowfish 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -256,11 +275,11 @@ dependencies = [
[[package]]
name = "blowfish"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"block-cipher-trait 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"opaque-debug 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -312,7 +331,7 @@ dependencies = [
[[package]]
name = "cargo_metadata"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -324,7 +343,7 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.26"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -479,10 +498,10 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "crossbeam-epoch 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -491,7 +510,7 @@ name = "crossbeam-epoch"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "arrayvec 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -504,7 +523,20 @@ name = "crossbeam-epoch"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "arrayvec 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -532,16 +564,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "csv"
-version = "1.0.2"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "csv-core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "csv-core"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -638,7 +670,7 @@ dependencies = [
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -682,6 +714,11 @@ dependencies = [
"generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "dotenv"
version = "0.13.0"
@@ -782,7 +819,7 @@ name = "error-chain"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -790,12 +827,12 @@ name = "error-chain"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "fail"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -808,7 +845,7 @@ name = "failure"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -819,7 +856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
"synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -876,7 +913,7 @@ dependencies = [
[[package]]
name = "fst"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -888,7 +925,7 @@ name = "fst-regex"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "fst 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fst 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1028,7 +1065,7 @@ dependencies = [
[[package]]
name = "heck"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1049,7 +1086,7 @@ dependencies = [
"markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1097,7 +1134,7 @@ dependencies = [
[[package]]
name = "hyper"
-version = "0.12.18"
+version = "0.12.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1128,7 +1165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)",
"native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1247,7 +1284,7 @@ name = "levenshtein_automata"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "fst 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fst 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1331,7 +1368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "md5"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1489,12 +1526,12 @@ dependencies = [
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
"schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"security-framework 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1522,7 +1559,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
"void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1596,7 +1633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "openssl"
-version = "0.10.15"
+version = "0.10.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1604,7 +1641,7 @@ dependencies = [
"foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1614,10 +1651,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "openssl-sys"
-version = "0.9.39"
+version = "0.9.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1676,7 +1713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
"version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"yansi 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1688,7 +1725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "pest"
-version = "2.0.2"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1696,32 +1733,32 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.0.1"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest_generator 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "pest_generator"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest_meta 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "pest_meta"
-version = "2.0.3"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1780,7 +1817,7 @@ dependencies = [
"dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"guid-create 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"plume-api 0.2.0",
@@ -1835,10 +1872,10 @@ dependencies = [
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"pulldown-cmark 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"reqwest 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rocket 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1847,6 +1884,13 @@ dependencies = [
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "plume-front"
+version = "0.1.0"
+dependencies = [
+ "stdweb 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "plume-models"
version = "0.2.0"
@@ -1860,10 +1904,10 @@ dependencies = [
"diesel 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"diesel_migrations 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"guid-create 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"plume-api 0.2.0",
"plume-common 0.2.0",
"reqwest 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1872,7 +1916,7 @@ dependencies = [
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "tantivy 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tantivy 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"webfinger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"whatlang 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2158,7 +2202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -2171,7 +2215,7 @@ dependencies = [
"encoding_rs 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper-tls 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2192,7 +2236,7 @@ name = "ring"
version = "0.13.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
"untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2311,7 +2355,7 @@ dependencies = [
"bytecount 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "md5 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "md5 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -2326,7 +2370,7 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.9"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -2390,14 +2434,15 @@ dependencies = [
"core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "security-framework-sys"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
+ "MacTypes-sys 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -2428,7 +2473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -2478,6 +2523,11 @@ dependencies = [
"fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "siphasher"
version = "0.2.3"
@@ -2489,7 +2539,7 @@ version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bytecount 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cargo_metadata 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"pulldown-cmark 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2538,6 +2588,52 @@ name = "state"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "stdweb"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb-derive 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb-internal-macros 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb-internal-runtime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stdweb-derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stdweb-internal-macros"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base-x 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stdweb-internal-runtime"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "string"
version = "0.1.2"
@@ -2611,17 +2707,7 @@ dependencies = [
[[package]]
name = "syn"
-version = "0.14.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "0.15.22"
+version = "0.15.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2644,13 +2730,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "tantivy"
-version = "0.7.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"atomicwrites 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2663,10 +2749,10 @@ dependencies = [
"crossbeam 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"downcast 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "fail 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fail 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "fst 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fst 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"fst-regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2734,8 +2820,8 @@ dependencies = [
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest_derive 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2884,7 +2970,7 @@ name = "tokio-threadpool"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "crossbeam-deque 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3140,7 +3226,7 @@ dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
"validator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -3200,7 +3286,7 @@ name = "whatlang"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "csv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3266,6 +3352,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
+"checksum MacTypes-sys 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7dbbe033994ae2198a18517c7132d952a29fb1db44249a1234779da7c50f4698"
"checksum activitypub 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0ee1a18ca5e4056ca90c7698ba0505ecc91454e8e6b57d3572ad5675979bfcdd"
"checksum activitystreams-derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "48db826c588a009960d74530e7c215e21fae130f585362504dc6b6357e5ce86b"
"checksum activitystreams-traits 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "670ef03168e704b0cae242e7a5d8b40506772b339687e01a3496fc4afe2e8542"
@@ -3277,15 +3364,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
"checksum array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271"
"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
-"checksum arrayvec 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f405cc4c21cd8b784f6c8fc2adf9bc00f59558f0049b5ec21517f875963040cc"
+"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
"checksum ascii 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5fc969a8ce2c9c0c4b0429bb8431544f6658283c8326ba5ff8c762b75369335"
"checksum askama_escape 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "719b48039ffac1564f67d70162109ba9341125cee0096a540e478355b3c724a7"
"checksum atom_syndication 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a9a7ab83635ff7a3b04856f4ad95324dccc9b947ab1e790fc5c769ee6d6f60c"
"checksum atomicwrites 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a3420b33cdefd3feb223dddc23739fc05cc034eb0f2be792c763e3d89e1eb6e3"
"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
+"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
"checksum backtrace 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "150ae7828afa7afb6d474f909d64072d21de1f3365b6e8ad8029bf7b1c6350a0"
-"checksum backtrace 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "a2eff3830839471718ef8522b9025b399bfb713e25bc220da721364efb660d7d"
-"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
+"checksum base-x 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5cda5d0f5584d129112ad8bf4775b9fd2b9f1e30738c7b1a25314ba2244d6a51"
"checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2"
"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
"checksum bcrypt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ed2ad250bf378af5c54614c5e2f9ed1a465d73ac198905cc555492ad899a37c"
@@ -3296,7 +3385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum bitpacking 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "75c04b83d2b444a22c6a30f4d068597efbe468fe56f068e042e627ded2fb21e7"
"checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
"checksum block-cipher-trait 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "370424437b9459f3dfd68428ed9376ddfe03d8b70ede29cc533b3557df186ab4"
-"checksum blowfish 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "95ede07672d9f4144c578439aa352604ec5c67a80c940fe8d382ddbeeeb3c6d8"
+"checksum blowfish 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "613fba6b26f4065f4314692263fa5221f0cab239467e407981ff437a10389376"
"checksum buf_redux 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72f25c67abbf523ff8457771622fb731ac4a2391439de33bc60febcdee1749c9"
"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
"checksum bytecount 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b92204551573580e078dc80017f36a213eb77a0450e4ddd8cfa0f3f2d1f0178f"
@@ -3304,8 +3393,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
"checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
"checksum canapi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aab4d6d1edcef8bf19b851b7730d3d1a90373c06321a49a984baebe0989c962c"
-"checksum cargo_metadata 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "48e8d5fd5b81d86d3ec3c820ecf5a3027fa22d6aede2be981cf07a8ce16451bb"
-"checksum cc 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "389803e36973d242e7fecb092b2de44a3d35ac62524b3b9339e51d577d668e02"
+"checksum cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1b4d380e1bab994591a24c2bdd1b054f64b60bef483a8c598c7c345bc3bbe"
+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
"checksum census 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5c044df9888597e4e96610c916ce9d58c653b67c01b5eac5b7abd7405f4fee4"
"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
"checksum chomp 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f74ad218e66339b11fd23f693fb8f1d621e80ba6ac218297be26073365d163d"
@@ -3322,14 +3411,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum crossbeam 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7408247b1b87f480890f28b670c5f8d9a8a4274833433fe74dc0dfd46d33650"
"checksum crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b85741761b7f160bc5e7e0c14986ef685b7f8bf9b7ad081c60c604bb4649827"
"checksum crossbeam-deque 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7792c4a9b5a4222f654e3728a3dd945aacc24d2c3a1a096ed265d80e4929cb9a"
-"checksum crossbeam-deque 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4fe1b6f945f824c7a25afe44f62e25d714c0cc523f8e99d8db5cd1026e1269d3"
+"checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
"checksum crossbeam-epoch 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30fecfcac6abfef8771151f8be4abc9e4edc112c2bcb233314cafde2680536e9"
"checksum crossbeam-epoch 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2449aaa4ec7ef96e5fb24db16024b935df718e9ae1cec0a1e68feeca2efca7b8"
+"checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
"checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015"
"checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
"checksum crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda"
-"checksum csv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d54f6b0fd69128a2894b1a3e57af5849a0963c1cc77b165d30b896e40296452"
-"checksum csv-core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4dd8e6d86f7ba48b4276ef1317edc8cc36167546d8972feb4a2b5fec0b374105"
+"checksum csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd1c44c58078cfbeaf11fbb3eac9ae5534c23004ed770cc4bfb48e658ae4f04"
+"checksum csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5cdef62f37e6ffe7d1f07a381bc0db32b7a3ff1cac0de56cb0d81e71f53d65"
"checksum ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "630391922b1b893692c6334369ff528dcc3a9d8061ccf4c803aa8f83cb13db5e"
"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
"checksum data-encoding 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "67df0571a74bf0d97fb8b2ed22abdd9a48475c96bd327db968b7d9cace99655e"
@@ -3346,6 +3436,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum diesel_derives 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "03bcaf77491f53e400d5ee3bdd57142ea4e1c47fe9217b3361ff9a76ca0e3d37"
"checksum diesel_migrations 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b42c35d1ce9e8d57a3e7001b4127f2bc1b073a89708bb7019f5be27c991c28"
"checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
+"checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
"checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
"checksum downcast 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6c6fe31318b6ef21166c8e839e680238eb16f875849d597544eead7ec882eed3"
"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
@@ -3361,7 +3452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum encoding_rs 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1a8fa54e6689eb2549c4efed8d00d7f3b2b994a064555b0e8df4ae3764bcc4be"
"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
"checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
-"checksum fail 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd2e1a22c616c8c8c96b6e07c243014551f3ba77291d24c22e0bfea6830c0b4e"
+"checksum fail 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4eca5f0f9a67b3e504f3a0ab0bc22efb19b241c0313be5b897ee7e8d85a1805a"
"checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7"
"checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596"
"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
@@ -3371,7 +3462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
"checksum fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c4bbbf71584aeed076100b5665ac14e3d85eeb31fdbb45fbd41ef9a682b5ec05"
"checksum fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a772d36c338d07a032d5375a36f15f9a7043bf0cb8ce7cee658e037c6032874"
-"checksum fst 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9b0408ab57c1bf7c634b2ac6a165d14f642dc3335a43203090a7f8c78b54577b"
+"checksum fst 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "db72126ca7dff566cdbbdd54af44668c544897d9d3862b198141f176f1238bdf"
"checksum fst-regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "87aca1d91eed3c128132cee31d291fd4e8492df0b742a5b1453857a4c7cedd88"
"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
@@ -3387,7 +3478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum guid-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "abc7adb441828023999e6cff9eb1ea63156f7ec37ab5bf690005e8fc6c1148ad"
"checksum h2 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1ac030ae20dee464c5d0f36544d8b914a6bc606da44a57e052d2b0f5dae129e0"
"checksum hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "64b7d419d0622ae02fe5da6b9a5e1964b610a65bb37923b976aeebb6dbb8f86e"
-"checksum heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea04fa3ead4e05e51a7c806fc07271fdbde4e246a6c6d1efd52e72230b771b82"
+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
"checksum html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c213fa6a618dc1da552f54f85cba74b05d8e883c92ec4e89067736938084c26e"
"checksum htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
@@ -3395,7 +3486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
"checksum humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e"
"checksum hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "df0caae6b71d266b91b4a83111a61d2b94ed2e2bea024c532b933dcff867e58c"
-"checksum hyper 0.12.18 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd7729fc83d88353415f6816fd4bb00897aa47c7f1506b69060e74e6e3d8e8b"
+"checksum hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)" = "f1ebec079129e43af5e234ef36ee3d7e6085687d145b7ea653b262d16c6b65f1"
"checksum hyper-tls 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "32cd73f14ad370d3b4d4b7dce08f69b81536c82e39fcc89731930fe5788cd661"
"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
"checksum if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4bac95d9aa0624e7b78187d6fb8ab012b41d9f6f54b1bcb61e61c4845f8357ec"
@@ -3423,7 +3514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
"checksum markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "897636f9850c3eef4905a5540683ed53dc9393860f0846cab2c2ddf9939862ff"
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum md5 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2cfd7095f695c117f89db0a838710180bc22f1867e2454a5c810a538baee55f9"
+"checksum md5 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e6bcd6433cff03a4bfc3d9834d504467db1f1cf6d0ea765d37d330249ed629d"
"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9"
"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
@@ -3450,9 +3541,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
"checksum opaque-debug 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d620c9c26834b34f039489ac0dfdb12c7ac15ccaf818350a64c9b5334a452ad7"
-"checksum openssl 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "5e1309181cdcbdb51bc3b6bedb33dfac2a83b3d585033d3f6d9e22e8c1928613"
+"checksum openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9"
"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-"checksum openssl-sys 0.9.39 (registry+https://github.com/rust-lang/crates.io-index)" = "278c1ad40a89aa1e741a1eed089a2f60b18fab8089c3139b542140fc7d674106"
+"checksum openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)" = "1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6"
"checksum owned-read 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05d57fab18d627fc4dffbd78d4a25a5b5b5211fda724231f001bee4cef1b2d3b"
"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
@@ -3460,10 +3551,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum pear 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c26d2b92e47063ffce70d3e3b1bd097af121a9e0db07ca38a6cc1cf0cc85ff25"
"checksum pear_codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "336db4a192cc7f54efeb0c4e11a9245394824cc3bcbd37ba3ff51240c35d7a6e"
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-"checksum pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a677051ad923732bb5c70f2d45f8985a96e3eee2e2bff86697e3b11b0c3fcfde"
-"checksum pest_derive 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b76f477146419bc539a63f4ef40e902166cb43b3e51cecc71d9136fd12c567e7"
-"checksum pest_generator 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ebee4e9680be4fd162e6f3394ae4192a6b60b1e4d17d845e631f0c68d1a3386"
-"checksum pest_meta 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1f6d5f6f0e6082578c86af197d780dc38328e3f768cec06aac9bc46d714e8221"
+"checksum pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54f0c72a98d8ab3c99560bfd16df8059cc10e1f9a8e83e6e3b97718dd766e9c3"
+"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+"checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646"
+"checksum pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5a3492a4ed208ffc247adcdcc7ba2a95be3104f58877d0d02f0df39bf3efb5e"
"checksum phf 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)" = "cec29da322b242f4c3098852c77a0ca261c9c01b806cae85a5572a1eb94db9a6"
"checksum phf_codegen 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)" = "7d187f00cd98d5afbcd8898f6cf181743a449162aeb329dcd2f3849009e605ad"
"checksum phf_generator 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)" = "03dc191feb9b08b0dc1330d6549b795b9d81aec19efe6b4a45aec8d4caee0c4b"
@@ -3515,7 +3606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rsass 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a389c30b2f7b43b64cbb489b7cce51b672845fee3cd14ba69f9dfdcb3b38873e"
"checksum ructe 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "da9fece3121ef196658db041025d757eebbe9d08c8c09a5808cb4380d83dadc8"
"checksum rust-stemmers 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fbf06149ec391025664a5634200ced1afb489f0f3f8a140d515ebc0eb04b4bc0"
-"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
+"checksum rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "01b90379b8664dd83460d59bdc5dd1fd3172b8913788db483ed1325171eab2f7"
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
"checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
@@ -3525,7 +3616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum scheduled-thread-pool 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a2ff3fc5223829be817806c6441279c676e454cc7da608faf03b0ccc09d3889"
"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
"checksum security-framework 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "697d3f3c23a618272ead9e1fb259c1411102b31c6af8b93f1d64cca9c3b0e8e0"
-"checksum security-framework-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab01dfbe5756785b5b4d46e0289e5a18071dfa9a7c2b24213ea00b9ef9b665bf"
+"checksum security-framework-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "40d95f3d7da09612affe897f320d78264f0d2320f3e8eea27d12bd1bd94445e2"
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
"checksum serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)" = "6fa52f19aee12441d5ad11c9a00459122bd8f98707cadf9778c540674f1935b6"
@@ -3534,6 +3625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum serde_qs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5873a8c1e2dc41f1d9305b7510f70768376dc974f81c0b9ce6b4d5b48be0203"
"checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
"checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded"
+"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
"checksum skeptic 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6fb8ed853fdc19ce09752d63f3a2e5b5158aeb261520cd75eb618bd60305165"
"checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d"
@@ -3542,6 +3634,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum snap 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "95d697d63d44ad8b78b8d235bf85b34022a78af292c8918527c5f0cffdde7f43"
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
"checksum state 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7345c971d1ef21ffdbd103a75990a15eb03604fc8b8852ca8cb418ee1a099028"
+"checksum stdweb 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "b84f9c829ef7d2e6abf1965393b231c0fd495f0293d612f32dbadd637e91fd0d"
+"checksum stdweb-derive 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e21ebd9179de08f2300a65454268a17ea3de204627458588c84319c4def3930"
+"checksum stdweb-internal-macros 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d60e306bddd5d213f86f7b417b6cdcefbf742917414ac9dda6e9750ef4553dce"
+"checksum stdweb-internal-runtime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a2a2f4a2eb556337b2d1a302630bbddf989ae383c70393e89b48152b9896cbda"
"checksum string 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98998cced76115b1da46f63388b909d118a37ae0be0f82ad35773d4a4bc9d18d"
"checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423"
"checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da"
@@ -3550,11 +3646,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
"checksum syn 0.12.15 (registry+https://github.com/rust-lang/crates.io-index)" = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5"
"checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
-"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
-"checksum syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)" = "ae8b29eb5210bc5cf63ed6149cbf9adfc82ac0be023d8735c176ee74a2db4da7"
+"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
-"checksum tantivy 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34fab04422b020c9e6e4b5f4a2eb5d6727ce89d244a9f96434347956c8d9dad6"
+"checksum tantivy 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "433d4e3511526f1db0a16d50e5f1951e77f70f4c462e963c58b561c35cede257"
"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
"checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b"
diff --git a/Cargo.toml b/Cargo.toml
index 4a29e22a..63376308 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,4 +72,4 @@ postgres = ["plume-models/postgres", "diesel/postgres"]
sqlite = ["plume-models/sqlite", "diesel/sqlite"]
[workspace]
-members = ["plume-api", "plume-cli", "plume-models", "plume-common"]
+members = ["plume-api", "plume-cli", "plume-models", "plume-common", "plume-front"]
diff --git a/Dockerfile b/Dockerfile
index 0b6304d6..1c54d791 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
WORKDIR /app
COPY Cargo.toml Cargo.lock ./
RUN cargo install diesel_cli --no-default-features --features postgres --version '=1.3.0'
+RUN cargo install cargo-web
COPY . .
+RUN cargo web deploy -p plume-front
RUN cargo install --path ./ --force --no-default-features --features postgres
RUN cargo install --path plume-cli --force --no-default-features --features postgres
RUN cargo clean
diff --git a/build.rs b/build.rs
index 7302219c..c97b81ce 100644
--- a/build.rs
+++ b/build.rs
@@ -2,7 +2,7 @@ extern crate ructe;
extern crate rocket_i18n;
extern crate rsass;
use ructe::*;
-use std::{env, fs::File, io::Write, path::PathBuf};
+use std::{env, fs::*, io::Write, path::PathBuf};
fn main() {
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
@@ -20,4 +20,8 @@ fn main() {
&rsass::compile_scss_file("static/css/main.scss".as_ref(), rsass::OutputStyle::Compressed)
.expect("Error during SCSS compilation")
).expect("Couldn't write CSS output");
+
+ copy("target/deploy/plume-front.wasm", "static/plume-front.wasm")
+ .and_then(|_| read_to_string("target/deploy/plume-front.js"))
+ .and_then(|js| write("static/plume-front.js", js.replace("\"plume-front.wasm\"", "\"/static/plume-front.wasm\""))).ok();
}
diff --git a/plume-front/Cargo.toml b/plume-front/Cargo.toml
new file mode 100644
index 00000000..ef464ce3
--- /dev/null
+++ b/plume-front/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "plume-front"
+version = "0.1.0"
+authors = ["Plume contributors"]
+
+[dependencies]
+stdweb = "0.4"
diff --git a/plume-front/src/main.rs b/plume-front/src/main.rs
new file mode 100644
index 00000000..5b08b191
--- /dev/null
+++ b/plume-front/src/main.rs
@@ -0,0 +1,67 @@
+#[macro_use]
+extern crate stdweb;
+
+use stdweb::{unstable::TryFrom, web::{*, event::*}};
+
+fn main() {
+ auto_expand();
+ menu();
+ search();
+}
+
+/// Auto expands the editor when adding text
+fn auto_expand() {
+ match document().query_selector("#plume-editor") {
+ Ok(Some(x)) => HtmlElement::try_from(x).map(|article_content| {
+ let offset = article_content.offset_height() - (article_content.get_bounding_client_rect().get_height() as i32);
+ article_content.add_event_listener(move |_: KeyDownEvent| {
+ let article_content = document().query_selector("#plume-editor").ok();
+ js! {
+ @{&article_content}.style.height = "auto";
+ @{&article_content}.style.height = @{&article_content}.scrollHeight - @{offset} + "px";
+ }
+ });
+ }).ok(),
+ _ => None
+ };
+}
+
+/// Toggle menu on mobile device
+///
+/// It should normally be working fine even without this code
+/// But :focus-within is not yet supported by Webkit/Blink
+fn menu() {
+ document().get_element_by_id("menu")
+ .map(|button| {
+ document().get_element_by_id("content")
+ .map(|menu| {
+ button.add_event_listener(|_: ClickEvent| {
+ document().get_element_by_id("menu").map(|menu| menu.class_list().add("show"));
+ });
+ menu.add_event_listener(|_: ClickEvent| {
+ document().get_element_by_id("menu").map(|menu| menu.class_list().remove("show"));
+ });
+ })
+ });
+}
+
+/// Clear the URL of the search page before submitting request
+fn search() {
+ document().get_element_by_id("form")
+ .map(|form| {
+ form.add_event_listener(|_: SubmitEvent| {
+ document().query_selector_all("#form input").map(|inputs| {
+ for input in inputs {
+ js! {
+ if (@{&input}.name === "") {
+ @{&input}.name = @{&input}.id
+ }
+ if (@{&input}.name && !@{&input}.value) {
+ @{&input}.name = "";
+ }
+ }
+ }
+ }).ok();
+ });
+ });
+}
diff --git a/po/de.po b/po/de.po
index 60a80c76..d00ba369 100644
--- a/po/de.po
+++ b/po/de.po
@@ -72,7 +72,8 @@ msgstr "Benachrichtigungen"
msgid "Written by {0}"
msgstr ""
-msgid "This article is under the {0} license."
+#, fuzzy
+msgid "This article is published under the {0} license."
msgstr "Dieser Artikel steht unter der {0} Lizenz."
msgid "One like"
@@ -91,7 +92,8 @@ msgid_plural "{0} Boosts"
msgstr[0] "Ein Boost"
msgstr[1] "{0} Boosts"
-msgid "I don't want to boost this anymore"
+#, fuzzy
+msgid "I don't want this boosted anymore"
msgstr "Nicht mehr boosten"
msgid "Boost"
@@ -118,7 +120,8 @@ msgstr "Veröffentlichen"
msgid "Login"
msgstr "Login"
-msgid "Username or email"
+#, fuzzy
+msgid "Username, or email"
msgstr "Nutzername oder E-Mail"
msgid "Password"
@@ -130,7 +133,8 @@ msgstr "Dashboard"
msgid "Your Dashboard"
msgstr "Dein Dashboard"
-msgid "Your Blogs"
+#, fuzzy
+msgid "Your blogs"
msgstr "Deine Blogs"
msgid "You don't have any blog yet. Create your own, or ask to join one."
@@ -144,7 +148,8 @@ msgstr "Starte einen neuen Blog"
msgid "Admin"
msgstr "Admin"
-msgid "It is you"
+#, fuzzy
+msgid "That's you"
msgstr "Das bist du"
msgid "Edit your profile"
@@ -224,34 +229,43 @@ msgstr "Einloggen"
msgid "Register"
msgstr "Registrieren"
-msgid "You need to be logged in order to create a new blog"
+#, fuzzy
+msgid "You need to be signed in, for you to create a new blog"
msgstr "Du musst eingeloggt sein, um einen neuen Blog zu erstellen"
-msgid "You need to be logged in order to post a comment"
+#, fuzzy
+msgid "You need to be signed in, so that you can post a comment"
msgstr "Du musst eingeloggt sein, um einen Kommentar zu schreiben"
-msgid "You need to be logged in order to like a post"
+#, fuzzy
+msgid "You need to be signed in, in order for you to like a post"
msgstr "Du musst eingeloggt sein, um einen Beitrag zu Liken"
msgid "You need to be logged in order to see your notifications"
msgstr "Du musst eingeloggt sein, um deine Benachrichtigungen zu sehen"
-msgid "You need to be logged in order to write a new post"
+#, fuzzy
+msgid "You need to be logged in, to be able to write a new post"
msgstr "Du musst eingeloggt sein, um einen neuen Beitrag zu schreiben"
-msgid "You need to be logged in order to boost a post"
+#, fuzzy
+msgid "You need to be logged in, for you to be able to boost a post"
msgstr "Du musst eingeloggt sein, um einen Beitrag zu boosten"
-msgid "Invalid username or password"
+#, fuzzy
+msgid "Invalid username, or password"
msgstr "Nutzername oder Passwort ungültig"
-msgid "You need to be logged in order to access your dashboard"
+#, fuzzy
+msgid "You need to be logged in, to be able to access your dashboard"
msgstr "Du musst eingeloggt sein, um dein Dashboard zu sehen"
-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in, to be able to follow someone"
msgstr "Du musst eingeloggt sein, um jemandem zu folgen"
-msgid "You need to be logged in order to edit your profile"
+#, fuzzy
+msgid "You need to be logged in, to be able to edit your profile"
msgstr "Du musst eingeloggt sein, um dein Profil zu editieren"
msgid "By {0}"
@@ -266,7 +280,8 @@ msgstr "{0} folgt dir nun"
msgid "{0} liked your article"
msgstr "{0} hat deinen Artikel geliked"
-msgid "{0} commented your article"
+#, fuzzy
+msgid "{0} commented on your article"
msgstr "{0} hat deinen Artikel kommentiert"
msgid "We couldn't find this page."
@@ -278,7 +293,8 @@ msgstr "Der Link, welcher dich hier her führte, ist wohl kaputt."
msgid "You are not authorized."
msgstr "Nicht berechtigt."
-msgid "You are not author in this blog."
+#, fuzzy
+msgid "You are not an author on this blog."
msgstr "Du bist kein Autor in diesem Blog."
msgid "{0} mentioned you."
@@ -302,15 +318,17 @@ msgstr "Dein Kommentar kann nicht leer sein"
msgid "A post with the same title already exists."
msgstr "Ein Beitrag mit demselben Titel existiert bereits."
-msgid "We need an email or a username to identify you"
+#, fuzzy
+msgid "We need an email, or a username to identify you"
msgstr ""
"Wir brauchen eine E-Mail oder einen Nutzernamen um dich zu identifizieren"
-msgid "Your password can't be empty"
+#, fuzzy
+msgid "Your password field can't be empty"
msgstr "Dein Passwort darf nicht leer sein"
-msgid "Passwords are not matching"
-msgstr "Passwörter stimmen nicht überein"
+msgid "The two passwords must be a match!"
+msgstr ""
msgid "Username can't be empty"
msgstr "Nutzername darf nicht leer sein"
@@ -318,15 +336,17 @@ msgstr "Nutzername darf nicht leer sein"
msgid "Invalid email"
msgstr "Ungültige E-Mail Adresse"
-msgid "Password should be at least 8 characters long"
+#, fuzzy
+msgid "The password should be at least 8 characters long"
msgstr "Passwort sollte mindestens 8 Zeichen lang sein"
-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
-msgstr[0] "Ein Autor in diesem Blog: "
-msgstr[1] "{0} Autoren in diesem Blog: "
+msgid "This blog has one author: "
+msgid_plural "This blog has {0} authors: "
+msgstr[0] ""
+msgstr[1] ""
-msgid "Login or use your Fediverse account to interact with this article"
+#, fuzzy
+msgid "Log in, or use your Fediverse account to interact with this article"
msgstr ""
"Log dich ein oder nutze deinen Fediverse-Account um mit diesem Artikel zu "
"interagieren"
@@ -334,10 +354,10 @@ msgstr ""
msgid "Optional"
msgstr "Optional"
-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
-msgstr[0] "Ein Artikel in diesem Blog"
-msgstr[1] "{0} Artikel in diesem Blog"
+msgid "This blog has one article"
+msgid_plural "This blog has {0} articles"
+msgstr[0] ""
+msgstr[1] ""
msgid "Previous page"
msgstr "Vorherige Seite"
@@ -360,7 +380,8 @@ msgstr "Instanz-Einstellungen"
msgid "Allow anyone to register"
msgstr "Erlaube jedem die Registrierung"
-msgid "Short description"
+#, fuzzy
+msgid "Short description - byline"
msgstr "Kurze Beschreibung"
msgid "Markdown is supported"
@@ -375,7 +396,8 @@ msgstr "Voreingestellte Lizenz"
msgid "Save settings"
msgstr "Einstellungen speichern"
-msgid "No comments yet. Be the first to react!"
+#, fuzzy
+msgid "There are no comments here yet. Be the first to react!"
msgstr "Bisher keine Kommentare. Schreibe die erste Reaktion!"
msgid "About this instance"
@@ -387,12 +409,15 @@ msgstr "Was ist Plume?"
msgid "Plume is a decentralized blogging engine."
msgstr "Plume ist eine dezentrale Blogging-Engine."
-msgid "Authors can manage various blogs from an unique website."
+#, fuzzy
+msgid "Authors can manage various blogs, each from a separate, unique website."
msgstr "Autoren können verschiedene Blogs von einer Website aus verwalten."
+#, fuzzy
msgid ""
-"Articles are also visible on other Plume websites, and you can interact with "
-"them directly from other platforms like Mastodon."
+"Articles are also visible on other Plume websites, called instances, and you "
+"can interact with them directly from other platforms like Mastodon, or "
+"WriteFreely."
msgstr ""
"Artikel sind auch auf anderen Plume-Websites sichtbar und es ist möglich aus "
"anderen Plattformen wie Mastodon mit diesen zu interagieren."
@@ -409,7 +434,7 @@ msgstr ""
msgid "Who wrote {0} articles"
msgstr ""
-msgid "And connected to {0} other instances"
+msgid "And are connected to {0} other instances"
msgstr ""
msgid "Read the detailed rules"
@@ -444,13 +469,16 @@ msgstr "Mediendetails"
msgid "Go back to the gallery"
msgstr "Zurück zur Gallerie"
-msgid "Markdown code"
+#, fuzzy
+msgid "Markdown syntax"
msgstr "Markdown Code"
-msgid "Copy it in your articles to insert this media."
+#, fuzzy
+msgid "Copy it into your articles, to insert this media."
msgstr "Um diese Mediendatei einzufügen, kopiere sie in deine Artikel."
-msgid "Use as avatar"
+#, fuzzy
+msgid "Use as an avatar"
msgstr "Als Avatar verwenden"
msgid "Delete"
@@ -459,7 +487,8 @@ msgstr "Löschen"
msgid "Upload"
msgstr "Hochladen"
-msgid "You don't have any media yet."
+#, fuzzy
+msgid "You don't have any media uploaded yet."
msgstr "Derzeit sind noch keine Mediendateien hochgeladen."
msgid "Media upload"
@@ -477,8 +506,10 @@ msgstr "Datei"
msgid "Send"
msgstr "Senden"
+#, fuzzy
msgid ""
-"Sorry, but registrations are closed on this instance. Try to find another one"
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
msgstr ""
"Tut mir leid. Auf dieser Instanz sind Registrierungen derzeit nicht möglich. "
"Es gibt aber noch andere"
@@ -492,8 +523,9 @@ msgstr "Um zu liken, musst du eingeloggt sein"
msgid "Login to boost"
msgstr "Um zu boosten, musst du eingeloggt sein"
-msgid "Your feed"
-msgstr "Dein Feed"
+#, fuzzy
+msgid "Personal feed"
+msgstr "Lokaler Feed"
msgid "Federated feed"
msgstr "Föderativer Feed"
@@ -501,13 +533,15 @@ msgstr "Föderativer Feed"
msgid "Local feed"
msgstr "Lokaler Feed"
-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to follow some people."
msgstr "Hier gibts noch nichts. Versuche dich mehr Leuten anzuschließen."
msgid "Articles"
msgstr "Artikel"
-msgid "All the articles of the Fediverse"
+#, fuzzy
+msgid "All of the articles within the Fediverse"
msgstr "Alle Artikel des Fediverse"
msgid "Articles from {0}"
@@ -516,7 +550,8 @@ msgstr "Artikel von {0}"
msgid "View all"
msgstr "Alles anzeigen"
-msgid "Articles tagged \"{0}\""
+#, fuzzy
+msgid "Articles tagged under \"{0}\""
msgstr "Mit \"{0}\" markierte Artikel"
msgid "Edit"
@@ -560,10 +595,12 @@ msgstr "Blockade"
msgid "Ban"
msgstr "Sperre"
-msgid "Useful for visually impaired people and licensing"
+#, fuzzy
+msgid "Useful for visually impaired people and information about licenses"
msgstr "Hilfreich für Sehbehinderte und zur Lizenziserung"
-msgid "Let it empty if there is none"
+#, fuzzy
+msgid "Leave it empty, if none is meeded"
msgstr "Falls es dies nicht gibt, lass es leer"
msgid "Draft"
@@ -572,7 +609,8 @@ msgstr "Entwurf"
msgid "This is a draft, don't publish it yet."
msgstr "Dies ist ein Entwurf, noch nicht veröffentlichen."
-msgid "Update or publish"
+#, fuzzy
+msgid "Update, or publish"
msgstr "Aktualisieren oder veröffentlichen"
msgid "Your Drafts"
@@ -581,14 +619,16 @@ msgstr "Deine Entwürfe"
msgid "Danger zone"
msgstr "Gefahrenbereich"
-msgid "Be very careful, any action taken here can't be cancelled."
+#, fuzzy
+msgid "Be very careful, any action taken here cannot be reversed."
msgstr ""
"Sei umsichtig, jede ausgeführte Aktion kann hier nicht abgebrochen werden."
msgid "Delete your account"
msgstr "Eigenen Account löschen"
-msgid "Sorry, but as an admin, you can't leave your instance."
+#, fuzzy
+msgid "Sorry, but as an admin, you can't leave your own instance."
msgstr ""
"Tut mir leid. Als Administrator kannst du deine Instanz leider nicht "
"verlassen."
@@ -599,7 +639,7 @@ msgstr "Nutzende"
msgid "This post isn't published yet."
msgstr "Dieser Beitrag ist noch nicht veröffentlicht."
-msgid "There is currently no article with that tag"
+msgid "There are currently no articles with such a tag"
msgstr ""
#, fuzzy
@@ -610,12 +650,28 @@ msgid "None"
msgstr ""
#, fuzzy
-msgid "Let it empty reserve all rights"
+msgid "Leave empty to reserve all rights"
msgstr "Falls es dies nicht gibt, lass es leer"
msgid "All rights reserved."
msgstr ""
+#~ msgid "Passwords are not matching"
+#~ msgstr "Passwörter stimmen nicht überein"
+
+#~ msgid "One author in this blog: "
+#~ msgid_plural "{0} authors in this blog: "
+#~ msgstr[0] "Ein Autor in diesem Blog: "
+#~ msgstr[1] "{0} Autoren in diesem Blog: "
+
+#~ msgid "One article in this blog"
+#~ msgid_plural "{0} articles in this blog"
+#~ msgstr[0] "Ein Artikel in diesem Blog"
+#~ msgstr[1] "{0} Artikel in diesem Blog"
+
+#~ msgid "Your feed"
+#~ msgstr "Dein Feed"
+
#~ msgid "Home to"
#~ msgstr "Heimat von"
diff --git a/po/en.po b/po/en.po
index 34539069..149f70e7 100644
--- a/po/en.po
+++ b/po/en.po
@@ -69,7 +69,7 @@ msgstr ""
msgid "Written by {0}"
msgstr ""
-msgid "This article is under the {0} license."
+msgid "This article is published under the {0} license."
msgstr ""
#, fuzzy
@@ -89,7 +89,7 @@ msgid_plural "{0} Boosts"
msgstr[0] ""
msgstr[1] ""
-msgid "I don't want to boost this anymore"
+msgid "I don't want this boosted anymore"
msgstr ""
msgid "Boost"
@@ -116,7 +116,7 @@ msgstr ""
msgid "Login"
msgstr ""
-msgid "Username or email"
+msgid "Username, or email"
msgstr ""
msgid "Password"
@@ -128,7 +128,7 @@ msgstr ""
msgid "Your Dashboard"
msgstr ""
-msgid "Your Blogs"
+msgid "Your blogs"
msgstr ""
msgid "You don't have any blog yet. Create your own, or ask to join one."
@@ -140,7 +140,7 @@ msgstr ""
msgid "Admin"
msgstr ""
-msgid "It is you"
+msgid "That's you"
msgstr ""
msgid "Edit your profile"
@@ -224,34 +224,34 @@ msgstr ""
msgid "Register"
msgstr ""
-msgid "You need to be logged in order to create a new blog"
+msgid "You need to be signed in, for you to create a new blog"
msgstr ""
-msgid "You need to be logged in order to post a comment"
+msgid "You need to be signed in, so that you can post a comment"
msgstr ""
-msgid "You need to be logged in order to like a post"
+msgid "You need to be signed in, in order for you to like a post"
msgstr ""
msgid "You need to be logged in order to see your notifications"
msgstr ""
-msgid "You need to be logged in order to write a new post"
+msgid "You need to be logged in, to be able to write a new post"
msgstr ""
-msgid "You need to be logged in order to boost a post"
+msgid "You need to be logged in, for you to be able to boost a post"
msgstr ""
-msgid "Invalid username or password"
+msgid "Invalid username, or password"
msgstr ""
-msgid "You need to be logged in order to access your dashboard"
+msgid "You need to be logged in, to be able to access your dashboard"
msgstr ""
-msgid "You need to be logged in order to follow someone"
+msgid "You need to be logged in, to be able to follow someone"
msgstr ""
-msgid "You need to be logged in order to edit your profile"
+msgid "You need to be logged in, to be able to edit your profile"
msgstr ""
msgid "By {0}"
@@ -266,7 +266,7 @@ msgstr ""
msgid "{0} liked your article"
msgstr ""
-msgid "{0} commented your article"
+msgid "{0} commented on your article"
msgstr ""
msgid "We couldn't find this page."
@@ -278,7 +278,7 @@ msgstr ""
msgid "You are not authorized."
msgstr ""
-msgid "You are not author in this blog."
+msgid "You are not an author on this blog."
msgstr ""
msgid "{0} mentioned you."
@@ -302,13 +302,13 @@ msgstr ""
msgid "A post with the same title already exists."
msgstr ""
-msgid "We need an email or a username to identify you"
+msgid "We need an email, or a username to identify you"
msgstr ""
-msgid "Your password can't be empty"
+msgid "Your password field can't be empty"
msgstr ""
-msgid "Passwords are not matching"
+msgid "The two passwords must be a match!"
msgstr ""
msgid "Username can't be empty"
@@ -317,22 +317,22 @@ msgstr ""
msgid "Invalid email"
msgstr ""
-msgid "Password should be at least 8 characters long"
+msgid "The password should be at least 8 characters long"
msgstr ""
-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
+msgid "This blog has one author: "
+msgid_plural "This blog has {0} authors: "
msgstr[0] ""
msgstr[1] ""
-msgid "Login or use your Fediverse account to interact with this article"
+msgid "Log in, or use your Fediverse account to interact with this article"
msgstr ""
msgid "Optional"
msgstr ""
-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
+msgid "This blog has one article"
+msgid_plural "This blog has {0} articles"
msgstr[0] ""
msgstr[1] ""
@@ -357,7 +357,7 @@ msgstr ""
msgid "Allow anyone to register"
msgstr ""
-msgid "Short description"
+msgid "Short description - byline"
msgstr ""
msgid "Markdown is supported"
@@ -372,7 +372,7 @@ msgstr ""
msgid "Save settings"
msgstr ""
-msgid "No comments yet. Be the first to react!"
+msgid "There are no comments here yet. Be the first to react!"
msgstr ""
msgid "About this instance"
@@ -384,12 +384,13 @@ msgstr ""
msgid "Plume is a decentralized blogging engine."
msgstr ""
-msgid "Authors can manage various blogs from an unique website."
+msgid "Authors can manage various blogs, each from a separate, unique website."
msgstr ""
msgid ""
-"Articles are also visible on other Plume websites, and you can interact with "
-"them directly from other platforms like Mastodon."
+"Articles are also visible on other Plume websites, called instances, and you "
+"can interact with them directly from other platforms like Mastodon, or "
+"WriteFreely."
msgstr ""
msgid "Create your account"
@@ -404,7 +405,7 @@ msgstr ""
msgid "Who wrote {0} articles"
msgstr ""
-msgid "And connected to {0} other instances"
+msgid "And are connected to {0} other instances"
msgstr ""
msgid "Read the detailed rules"
@@ -437,13 +438,13 @@ msgstr ""
msgid "Go back to the gallery"
msgstr ""
-msgid "Markdown code"
+msgid "Markdown syntax"
msgstr ""
-msgid "Copy it in your articles to insert this media."
+msgid "Copy it into your articles, to insert this media."
msgstr ""
-msgid "Use as avatar"
+msgid "Use as an avatar"
msgstr ""
msgid "Delete"
@@ -452,7 +453,7 @@ msgstr ""
msgid "Upload"
msgstr ""
-msgid "You don't have any media yet."
+msgid "You don't have any media uploaded yet."
msgstr ""
msgid "Media upload"
@@ -471,7 +472,8 @@ msgid "Send"
msgstr ""
msgid ""
-"Sorry, but registrations are closed on this instance. Try to find another one"
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
msgstr ""
msgid "Subtitle"
@@ -483,7 +485,7 @@ msgstr ""
msgid "Login to boost"
msgstr ""
-msgid "Your feed"
+msgid "Personal feed"
msgstr ""
msgid "Federated feed"
@@ -492,13 +494,13 @@ msgstr ""
msgid "Local feed"
msgstr ""
-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to follow some people."
msgstr ""
msgid "Articles"
msgstr ""
-msgid "All the articles of the Fediverse"
+msgid "All of the articles within the Fediverse"
msgstr ""
#, fuzzy
@@ -509,7 +511,7 @@ msgid "View all"
msgstr ""
#, fuzzy
-msgid "Articles tagged \"{0}\""
+msgid "Articles tagged under \"{0}\""
msgstr "Welcome to {{ instance_name }}"
msgid "Edit"
@@ -549,10 +551,10 @@ msgstr ""
msgid "Ban"
msgstr ""
-msgid "Useful for visually impaired people and licensing"
+msgid "Useful for visually impaired people and information about licenses"
msgstr ""
-msgid "Let it empty if there is none"
+msgid "Leave it empty, if none is meeded"
msgstr ""
msgid "Draft"
@@ -561,7 +563,7 @@ msgstr ""
msgid "This is a draft, don't publish it yet."
msgstr ""
-msgid "Update or publish"
+msgid "Update, or publish"
msgstr ""
msgid "Your Drafts"
@@ -570,13 +572,13 @@ msgstr ""
msgid "Danger zone"
msgstr ""
-msgid "Be very careful, any action taken here can't be cancelled."
+msgid "Be very careful, any action taken here cannot be reversed."
msgstr ""
msgid "Delete your account"
msgstr ""
-msgid "Sorry, but as an admin, you can't leave your instance."
+msgid "Sorry, but as an admin, you can't leave your own instance."
msgstr ""
msgid "Users"
@@ -585,7 +587,7 @@ msgstr ""
msgid "This post isn't published yet."
msgstr ""
-msgid "There is currently no article with that tag"
+msgid "There are currently no articles with such a tag"
msgstr ""
msgid "Illustration"
@@ -594,7 +596,7 @@ msgstr ""
msgid "None"
msgstr ""
-msgid "Let it empty reserve all rights"
+msgid "Leave empty to reserve all rights"
msgstr ""
msgid "All rights reserved."
diff --git a/po/fr.po b/po/fr.po
index 34291c39..1023df56 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -75,7 +75,8 @@ msgstr "Notifications"
msgid "Written by {0}"
msgstr "Écrit par {0}"
-msgid "This article is under the {0} license."
+#, fuzzy
+msgid "This article is published under the {0} license."
msgstr "Cet article est placé sous la licence {0}"
msgid "One like"
@@ -94,7 +95,8 @@ msgid_plural "{0} Boosts"
msgstr[0] "{0} partage"
msgstr[1] "{0} partages"
-msgid "I don't want to boost this anymore"
+#, fuzzy
+msgid "I don't want this boosted anymore"
msgstr "Je ne veux plus repartager ceci"
msgid "Boost"
@@ -121,7 +123,8 @@ msgstr "Publier"
msgid "Login"
msgstr "Se connecter"
-msgid "Username or email"
+#, fuzzy
+msgid "Username, or email"
msgstr "Nom d’utilisateur ou adresse électronique"
msgid "Password"
@@ -133,7 +136,8 @@ msgstr "Tableau de bord"
msgid "Your Dashboard"
msgstr "Votre tableau de bord"
-msgid "Your Blogs"
+#, fuzzy
+msgid "Your blogs"
msgstr "Vos blogs"
msgid "You don't have any blog yet. Create your own, or ask to join one."
@@ -147,7 +151,8 @@ msgstr "Commencer un nouveau blog"
msgid "Admin"
msgstr "Administrateur"
-msgid "It is you"
+#, fuzzy
+msgid "That's you"
msgstr "C’est vous"
msgid "Edit your profile"
@@ -227,34 +232,43 @@ msgstr "Se connecter"
msgid "Register"
msgstr "S’inscrire"
-msgid "You need to be logged in order to create a new blog"
+#, fuzzy
+msgid "You need to be signed in, for you to create a new blog"
msgstr "Vous devez vous connecter pour créer un nouveau blog"
-msgid "You need to be logged in order to post a comment"
+#, fuzzy
+msgid "You need to be signed in, so that you can post a comment"
msgstr "Vous devez vous connecter pour commenter"
-msgid "You need to be logged in order to like a post"
+#, fuzzy
+msgid "You need to be signed in, in order for you to like a post"
msgstr "Vous devez vous connecter pour aimer un article"
msgid "You need to be logged in order to see your notifications"
msgstr "Vous devez vous connecter pour voir vos notifications"
-msgid "You need to be logged in order to write a new post"
+#, fuzzy
+msgid "You need to be logged in, to be able to write a new post"
msgstr "Vous devez vous connecter pour écrire un article"
-msgid "You need to be logged in order to boost a post"
+#, fuzzy
+msgid "You need to be logged in, for you to be able to boost a post"
msgstr "Vous devez vous connecter pour partager un article"
-msgid "Invalid username or password"
+#, fuzzy
+msgid "Invalid username, or password"
msgstr "Nom d’utilisateur ou mot de passe invalide"
-msgid "You need to be logged in order to access your dashboard"
+#, fuzzy
+msgid "You need to be logged in, to be able to access your dashboard"
msgstr "Vous devez vous connecter pour accéder à votre tableau de bord"
-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in, to be able to follow someone"
msgstr "Vous devez vous connecter pour suivre quelqu’un"
-msgid "You need to be logged in order to edit your profile"
+#, fuzzy
+msgid "You need to be logged in, to be able to edit your profile"
msgstr "Vous devez vous connecter pour modifier votre profil"
msgid "By {0}"
@@ -269,7 +283,8 @@ msgstr "{0} vous suit"
msgid "{0} liked your article"
msgstr "{0} a aimé votre article"
-msgid "{0} commented your article"
+#, fuzzy
+msgid "{0} commented on your article"
msgstr "{0} a commenté votre article"
msgid "We couldn't find this page."
@@ -281,7 +296,8 @@ msgstr "Vous avez probablement suivi un lien cassé."
msgid "You are not authorized."
msgstr "Vous n’avez pas les droits."
-msgid "You are not author in this blog."
+#, fuzzy
+msgid "You are not an author on this blog."
msgstr "Vous n’êtes pas auteur⋅ice dans ce blog."
msgid "{0} mentioned you."
@@ -305,16 +321,18 @@ msgstr "Votre commentaire ne peut pas être vide."
msgid "A post with the same title already exists."
msgstr "Un article avec le même titre existe déjà."
-msgid "We need an email or a username to identify you"
+#, fuzzy
+msgid "We need an email, or a username to identify you"
msgstr ""
"Nous avons besoin d’une adresse électronique ou d’un nom d’utilisateur pour "
"vous identifier"
-msgid "Your password can't be empty"
+#, fuzzy
+msgid "Your password field can't be empty"
msgstr "Votre mot de passe ne peut pas être vide."
-msgid "Passwords are not matching"
-msgstr "Les mots de passe ne correspondent pas."
+msgid "The two passwords must be a match!"
+msgstr ""
msgid "Username can't be empty"
msgstr "Le nom d’utilisateur ne peut pas être vide."
@@ -322,15 +340,17 @@ msgstr "Le nom d’utilisateur ne peut pas être vide."
msgid "Invalid email"
msgstr "Adresse électronique invalide"
-msgid "Password should be at least 8 characters long"
+#, fuzzy
+msgid "The password should be at least 8 characters long"
msgstr "Le mot de passe doit faire au moins 8 caractères."
-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
-msgstr[0] "{0} auteur⋅ice dans ce blog : "
-msgstr[1] "{0} auteur⋅ice⋅s dans ce blog : "
+msgid "This blog has one author: "
+msgid_plural "This blog has {0} authors: "
+msgstr[0] ""
+msgstr[1] ""
-msgid "Login or use your Fediverse account to interact with this article"
+#, fuzzy
+msgid "Log in, or use your Fediverse account to interact with this article"
msgstr ""
"Connectez-vous ou utilisez votre compte sur le Fediverse pour interagir avec "
"cet article"
@@ -338,10 +358,10 @@ msgstr ""
msgid "Optional"
msgstr "Optionnel"
-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
-msgstr[0] "{0} article dans ce blog"
-msgstr[1] "{0} articles dans ce blog"
+msgid "This blog has one article"
+msgid_plural "This blog has {0} articles"
+msgstr[0] ""
+msgstr[1] ""
msgid "Previous page"
msgstr "Page précédente"
@@ -364,7 +384,8 @@ msgstr "Paramètres de l’instance"
msgid "Allow anyone to register"
msgstr "Autoriser les inscriptions"
-msgid "Short description"
+#, fuzzy
+msgid "Short description - byline"
msgstr "Description courte"
msgid "Markdown is supported"
@@ -379,7 +400,8 @@ msgstr "Licence par défaut"
msgid "Save settings"
msgstr "Enregistrer les paramètres"
-msgid "No comments yet. Be the first to react!"
+#, fuzzy
+msgid "There are no comments here yet. Be the first to react!"
msgstr "Pas encore de commentaires. Soyez læ premier⋅ère à réagir !"
msgid "About this instance"
@@ -391,13 +413,16 @@ msgstr "Qu’est-ce que Plume ?"
msgid "Plume is a decentralized blogging engine."
msgstr "Plume est un moteur de blog décentralisé."
-msgid "Authors can manage various blogs from an unique website."
+#, fuzzy
+msgid "Authors can manage various blogs, each from a separate, unique website."
msgstr ""
"Les auteur⋅ice⋅s peuvent gérer différents blogs au sein d’un même site."
+#, fuzzy
msgid ""
-"Articles are also visible on other Plume websites, and you can interact with "
-"them directly from other platforms like Mastodon."
+"Articles are also visible on other Plume websites, called instances, and you "
+"can interact with them directly from other platforms like Mastodon, or "
+"WriteFreely."
msgstr ""
"Les articles sont également visibles sur d’autres sites Plume, et vous "
"pouvez interagir avec directement depuis d’autres plateformes telles que "
@@ -415,7 +440,8 @@ msgstr "Accueille {0} personnes"
msgid "Who wrote {0} articles"
msgstr "Qui ont écrit {0} articles"
-msgid "And connected to {0} other instances"
+#, fuzzy
+msgid "And are connected to {0} other instances"
msgstr "Et connecté à {0} autres instances"
msgid "Read the detailed rules"
@@ -448,13 +474,16 @@ msgstr "Détails du média"
msgid "Go back to the gallery"
msgstr "Retourner à la galerie"
-msgid "Markdown code"
+#, fuzzy
+msgid "Markdown syntax"
msgstr "Code Markdown"
-msgid "Copy it in your articles to insert this media."
+#, fuzzy
+msgid "Copy it into your articles, to insert this media."
msgstr "Copiez-le dans vos articles pour insérer ce média."
-msgid "Use as avatar"
+#, fuzzy
+msgid "Use as an avatar"
msgstr "Utiliser comme avatar"
msgid "Delete"
@@ -463,7 +492,8 @@ msgstr "Supprimer"
msgid "Upload"
msgstr "Téléverser"
-msgid "You don't have any media yet."
+#, fuzzy
+msgid "You don't have any media uploaded yet."
msgstr "Vous n’avez pas encore de média."
msgid "Media upload"
@@ -481,8 +511,10 @@ msgstr "Fichier"
msgid "Send"
msgstr "Envoyer"
+#, fuzzy
msgid ""
-"Sorry, but registrations are closed on this instance. Try to find another one"
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
msgstr ""
"Désolé, mais les inscriptions sont fermées sur cette instance. Essayez d’en "
"trouver une autre."
@@ -496,8 +528,9 @@ msgstr "Connectez-vous pour aimer"
msgid "Login to boost"
msgstr "Connectez-vous pour partager"
-msgid "Your feed"
-msgstr "Votre flux"
+#, fuzzy
+msgid "Personal feed"
+msgstr "Flux local"
msgid "Federated feed"
msgstr "Flux fédéré"
@@ -505,13 +538,15 @@ msgstr "Flux fédéré"
msgid "Local feed"
msgstr "Flux local"
-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to follow some people."
msgstr "Rien par ici pour le moment. Essayez de suivre plus de monde."
msgid "Articles"
msgstr "Articles"
-msgid "All the articles of the Fediverse"
+#, fuzzy
+msgid "All of the articles within the Fediverse"
msgstr "Tous les articles de la Fédiverse"
msgid "Articles from {0}"
@@ -520,7 +555,8 @@ msgstr "Articles de {0}"
msgid "View all"
msgstr "Tout afficher"
-msgid "Articles tagged \"{0}\""
+#, fuzzy
+msgid "Articles tagged under \"{0}\""
msgstr "Articles taggués « {0} »"
msgid "Edit"
@@ -562,10 +598,12 @@ msgstr "Bloquer"
msgid "Ban"
msgstr "Bannir"
-msgid "Useful for visually impaired people and licensing"
+#, fuzzy
+msgid "Useful for visually impaired people and information about licenses"
msgstr "Utile pour les personnes malvoyantes et les informations de copyright."
-msgid "Let it empty if there is none"
+#, fuzzy
+msgid "Leave it empty, if none is meeded"
msgstr "Laisser vide s’il n’y en a pas"
msgid "Draft"
@@ -574,7 +612,8 @@ msgstr "Brouillon"
msgid "This is a draft, don't publish it yet."
msgstr "Cet article est un brouillon, il sera publié plus tard."
-msgid "Update or publish"
+#, fuzzy
+msgid "Update, or publish"
msgstr "Mettre à jour ou publier"
msgid "Your Drafts"
@@ -583,14 +622,16 @@ msgstr "Vos brouillons"
msgid "Danger zone"
msgstr "Zone à risque"
-msgid "Be very careful, any action taken here can't be cancelled."
+#, fuzzy
+msgid "Be very careful, any action taken here cannot be reversed."
msgstr ""
"Faites très attention, aucune action entreprise ici ne pourra être annulée."
msgid "Delete your account"
msgstr "Supprimer votre compte"
-msgid "Sorry, but as an admin, you can't leave your instance."
+#, fuzzy
+msgid "Sorry, but as an admin, you can't leave your own instance."
msgstr ""
"Désolé, mais en tant qu’administrateur, vous ne pouvez pas quitter votre "
"instance."
@@ -601,7 +642,8 @@ msgstr "Utilisateurs"
msgid "This post isn't published yet."
msgstr "Cet article n’est pas encore publié."
-msgid "There is currently no article with that tag"
+#, fuzzy
+msgid "There are currently no articles with such a tag"
msgstr "Il n'y a pas encore d'article avec ce tag"
msgid "Illustration"
@@ -611,8 +653,24 @@ msgid "None"
msgstr "Aucun"
#, fuzzy
-msgid "Let it empty reserve all rights"
+msgid "Leave empty to reserve all rights"
msgstr "Laisser vide s’il n’y en a pas"
msgid "All rights reserved."
msgstr ""
+
+#~ msgid "Passwords are not matching"
+#~ msgstr "Les mots de passe ne correspondent pas."
+
+#~ msgid "One author in this blog: "
+#~ msgid_plural "{0} authors in this blog: "
+#~ msgstr[0] "{0} auteur⋅ice dans ce blog : "
+#~ msgstr[1] "{0} auteur⋅ice⋅s dans ce blog : "
+
+#~ msgid "One article in this blog"
+#~ msgid_plural "{0} articles in this blog"
+#~ msgstr[0] "{0} article dans ce blog"
+#~ msgstr[1] "{0} articles dans ce blog"
+
+#~ msgid "Your feed"
+#~ msgstr "Votre flux"
diff --git a/po/gl.po b/po/gl.po
index 59975cc4..a2fa15be 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -69,7 +69,8 @@ msgstr "Notificacións"
msgid "Written by {0}"
msgstr ""
-msgid "This article is under the {0} license."
+#, fuzzy
+msgid "This article is published under the {0} license."
msgstr "Este artigo ten licenza {0}"
msgid "One like"
@@ -88,7 +89,8 @@ msgid_plural "{0} Boosts"
msgstr[0] "Unha promoción"
msgstr[1] "{0} promocións"
-msgid "I don't want to boost this anymore"
+#, fuzzy
+msgid "I don't want this boosted anymore"
msgstr "Quero retirar a pomoción realizada"
msgid "Boost"
@@ -115,7 +117,8 @@ msgstr "Publicar"
msgid "Login"
msgstr "Conectar"
-msgid "Username or email"
+#, fuzzy
+msgid "Username, or email"
msgstr "Usuaria ou correo-e"
msgid "Password"
@@ -127,7 +130,8 @@ msgstr "Taboleiro"
msgid "Your Dashboard"
msgstr "O seu taboleiro"
-msgid "Your Blogs"
+#, fuzzy
+msgid "Your blogs"
msgstr "Os seus Blogs"
msgid "You don't have any blog yet. Create your own, or ask to join one."
@@ -139,7 +143,8 @@ msgstr "Iniciar un blog"
msgid "Admin"
msgstr "Admin"
-msgid "It is you"
+#, fuzzy
+msgid "That's you"
msgstr "É vostede"
msgid "Edit your profile"
@@ -220,34 +225,43 @@ msgstr "Conectar"
msgid "Register"
msgstr "Rexistrar"
-msgid "You need to be logged in order to create a new blog"
+#, fuzzy
+msgid "You need to be signed in, for you to create a new blog"
msgstr "Debe estar conectada para crear un novo blog"
-msgid "You need to be logged in order to post a comment"
+#, fuzzy
+msgid "You need to be signed in, so that you can post a comment"
msgstr "Debe estar conectada para publicar un comentario"
-msgid "You need to be logged in order to like a post"
+#, fuzzy
+msgid "You need to be signed in, in order for you to like a post"
msgstr "Debe estar conectada para gustar unha entrada"
msgid "You need to be logged in order to see your notifications"
msgstr "Debe estar conectada para ver as súas notificacións"
-msgid "You need to be logged in order to write a new post"
+#, fuzzy
+msgid "You need to be logged in, to be able to write a new post"
msgstr "Debe estar conectada para escribir un novo artigo"
-msgid "You need to be logged in order to boost a post"
+#, fuzzy
+msgid "You need to be logged in, for you to be able to boost a post"
msgstr "Precisa estar conectada para promover un artigo"
-msgid "Invalid username or password"
+#, fuzzy
+msgid "Invalid username, or password"
msgstr "Usuaria ou Contrasinal incorrectos"
-msgid "You need to be logged in order to access your dashboard"
+#, fuzzy
+msgid "You need to be logged in, to be able to access your dashboard"
msgstr "Debe estar conectada para acceder ao seu taboleiro"
-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in, to be able to follow someone"
msgstr "Debe estar conectada para seguir a alguén"
-msgid "You need to be logged in order to edit your profile"
+#, fuzzy
+msgid "You need to be logged in, to be able to edit your profile"
msgstr "Debe estar conectada para editar o seu perfil"
msgid "By {0}"
@@ -262,7 +276,8 @@ msgstr "{0} comezou a seguila"
msgid "{0} liked your article"
msgstr "{0} gustou do seu artigo"
-msgid "{0} commented your article"
+#, fuzzy
+msgid "{0} commented on your article"
msgstr "{0} comentou o seu artigo"
msgid "We couldn't find this page."
@@ -274,7 +289,8 @@ msgstr "A ligazón que a trouxo aquí podería estar quebrado"
msgid "You are not authorized."
msgstr "Non ten permiso."
-msgid "You are not author in this blog."
+#, fuzzy
+msgid "You are not an author on this blog."
msgstr "Vostede non é autora en este blog."
msgid "{0} mentioned you."
@@ -298,14 +314,16 @@ msgstr "O seu comentario non pode estar baldeiro"
msgid "A post with the same title already exists."
msgstr "Xa existe unha entrada co mismo nome."
-msgid "We need an email or a username to identify you"
+#, fuzzy
+msgid "We need an email, or a username to identify you"
msgstr "Precisamos un correo-e ou un nome de usuaria para identificala"
-msgid "Your password can't be empty"
+#, fuzzy
+msgid "Your password field can't be empty"
msgstr "O contrasinal non pode estar baldeiro"
-msgid "Passwords are not matching"
-msgstr "Con coinciden os contrasinais"
+msgid "The two passwords must be a match!"
+msgstr ""
msgid "Username can't be empty"
msgstr "O nome de usuaria non pode estar baldeiro"
@@ -313,15 +331,16 @@ msgstr "O nome de usuaria non pode estar baldeiro"
msgid "Invalid email"
msgstr "Correo-e non válido"
-msgid "Password should be at least 8 characters long"
+#, fuzzy
+msgid "The password should be at least 8 characters long"
msgstr "O contrasinal debe ter ao menos 8 caracteres"
-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
-msgstr[0] "Unha autora en este blog: "
-msgstr[1] "{0} autoras en este blog: "
+msgid "This blog has one author: "
+msgid_plural "This blog has {0} authors: "
+msgstr[0] ""
-msgid "Login or use your Fediverse account to interact with this article"
+#, fuzzy
+msgid "Log in, or use your Fediverse account to interact with this article"
msgstr ""
"Conéctese ou utilice a súa conta no fediverso para interactuar con este "
"artigo"
@@ -329,10 +348,9 @@ msgstr ""
msgid "Optional"
msgstr "Opcional"
-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
-msgstr[0] "Un artigo en este blog"
-msgstr[1] "{0} artigos en este blog"
+msgid "This blog has one article"
+msgid_plural "This blog has {0} articles"
+msgstr[0] ""
msgid "Previous page"
msgstr "Páxina anterior"
@@ -355,7 +373,8 @@ msgstr "Axustes da instancia"
msgid "Allow anyone to register"
msgstr "Permitir o rexistro aberto"
-msgid "Short description"
+#, fuzzy
+msgid "Short description - byline"
msgstr "Descrición curta"
msgid "Markdown is supported"
@@ -370,7 +389,8 @@ msgstr "Licenza por omisión"
msgid "Save settings"
msgstr "Gardar axustes"
-msgid "No comments yet. Be the first to react!"
+#, fuzzy
+msgid "There are no comments here yet. Be the first to react!"
msgstr "Sen comentarios. Sexa a primeira e comentar!"
msgid "About this instance"
@@ -382,12 +402,15 @@ msgstr "Qué é Plume?"
msgid "Plume is a decentralized blogging engine."
msgstr "Plume é un motor de publicación descentralizada."
-msgid "Authors can manage various blogs from an unique website."
+#, fuzzy
+msgid "Authors can manage various blogs, each from a separate, unique website."
msgstr "As autoras poden xestionar varios blogs desde un único sitio web."
+#, fuzzy
msgid ""
-"Articles are also visible on other Plume websites, and you can interact with "
-"them directly from other platforms like Mastodon."
+"Articles are also visible on other Plume websites, called instances, and you "
+"can interact with them directly from other platforms like Mastodon, or "
+"WriteFreely."
msgstr ""
"Os artigos son visibles tamén en outros sitios Plume, e pode interactuar "
"coneles desde outras plataformas como Mastadon."
@@ -404,7 +427,7 @@ msgstr ""
msgid "Who wrote {0} articles"
msgstr ""
-msgid "And connected to {0} other instances"
+msgid "And are connected to {0} other instances"
msgstr ""
msgid "Read the detailed rules"
@@ -437,13 +460,16 @@ msgstr "Detalles dos medios"
msgid "Go back to the gallery"
msgstr "Voltar a galería"
-msgid "Markdown code"
+#, fuzzy
+msgid "Markdown syntax"
msgstr "Código markdown"
-msgid "Copy it in your articles to insert this media."
+#, fuzzy
+msgid "Copy it into your articles, to insert this media."
msgstr "Copie para incrustar este contido nos seus artigos"
-msgid "Use as avatar"
+#, fuzzy
+msgid "Use as an avatar"
msgstr "Utilizar como avatar"
msgid "Delete"
@@ -452,7 +478,8 @@ msgstr "Eliminar"
msgid "Upload"
msgstr "Subir"
-msgid "You don't have any media yet."
+#, fuzzy
+msgid "You don't have any media uploaded yet."
msgstr "Aínda non ten medios"
msgid "Media upload"
@@ -470,8 +497,10 @@ msgstr "Ficheiro"
msgid "Send"
msgstr "Enviar"
+#, fuzzy
msgid ""
-"Sorry, but registrations are closed on this instance. Try to find another one"
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
msgstr ""
"Lamentámolo, pero o rexistro está pechado en esta instancia. Intente atopar "
"outra"
@@ -485,8 +514,9 @@ msgstr "Conéctese para gostar"
msgid "Login to boost"
msgstr "Conéctese para promover"
-msgid "Your feed"
-msgstr "Para vostede"
+#, fuzzy
+msgid "Personal feed"
+msgstr "Artigos locais"
msgid "Federated feed"
msgstr "Artigos federados"
@@ -494,13 +524,15 @@ msgstr "Artigos federados"
msgid "Local feed"
msgstr "Artigos locais"
-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to follow some people."
msgstr "Nada que ler por aquí. Intente seguir a máis xente."
msgid "Articles"
msgstr "Artigos"
-msgid "All the articles of the Fediverse"
+#, fuzzy
+msgid "All of the articles within the Fediverse"
msgstr "Todos os artigos do Fediverso"
msgid "Articles from {0}"
@@ -509,7 +541,8 @@ msgstr "Artigos desde {0}"
msgid "View all"
msgstr "Ver todos"
-msgid "Articles tagged \"{0}\""
+#, fuzzy
+msgid "Articles tagged under \"{0}\""
msgstr "Artigos etiquetados con {0}"
msgid "Edit"
@@ -553,10 +586,12 @@ msgstr "Bloquear"
msgid "Ban"
msgstr "Prohibir"
-msgid "Useful for visually impaired people and licensing"
+#, fuzzy
+msgid "Useful for visually impaired people and information about licenses"
msgstr "Útil para xente con problemas visuais e licenzas"
-msgid "Let it empty if there is none"
+#, fuzzy
+msgid "Leave it empty, if none is meeded"
msgstr "Deixar baldeiro si non hai ningunha"
msgid "Draft"
@@ -565,7 +600,8 @@ msgstr "Borrador"
msgid "This is a draft, don't publish it yet."
msgstr "Esto é un borrador, non publicar por agora."
-msgid "Update or publish"
+#, fuzzy
+msgid "Update, or publish"
msgstr "Actualizar ou publicar"
msgid "Your Drafts"
@@ -574,13 +610,15 @@ msgstr "O seus Borradores"
msgid "Danger zone"
msgstr "Zona perigosa"
-msgid "Be very careful, any action taken here can't be cancelled."
+#, fuzzy
+msgid "Be very careful, any action taken here cannot be reversed."
msgstr "Sexa coidadosa, as accións tomadas non se poden restablecer."
msgid "Delete your account"
msgstr "Eliminar a súa conta"
-msgid "Sorry, but as an admin, you can't leave your instance."
+#, fuzzy
+msgid "Sorry, but as an admin, you can't leave your own instance."
msgstr ""
"Lamentámolo, pero como administradora, non pode deixar a súa instancia."
@@ -590,7 +628,7 @@ msgstr "Usuarias"
msgid "This post isn't published yet."
msgstr "Esto é un borrador, non publicar por agora."
-msgid "There is currently no article with that tag"
+msgid "There are currently no articles with such a tag"
msgstr ""
#, fuzzy
@@ -601,12 +639,28 @@ msgid "None"
msgstr ""
#, fuzzy
-msgid "Let it empty reserve all rights"
+msgid "Leave empty to reserve all rights"
msgstr "Deixar baldeiro si non hai ningunha"
msgid "All rights reserved."
msgstr ""
+#~ msgid "Passwords are not matching"
+#~ msgstr "Con coinciden os contrasinais"
+
+#~ msgid "One author in this blog: "
+#~ msgid_plural "{0} authors in this blog: "
+#~ msgstr[0] "Unha autora en este blog: "
+#~ msgstr[1] "{0} autoras en este blog: "
+
+#~ msgid "One article in this blog"
+#~ msgid_plural "{0} articles in this blog"
+#~ msgstr[0] "Un artigo en este blog"
+#~ msgstr[1] "{0} artigos en este blog"
+
+#~ msgid "Your feed"
+#~ msgstr "Para vostede"
+
#~ msgid "Home to"
#~ msgstr "Fogar de"
diff --git a/po/it.po b/po/it.po
index 6c7c8ebb..d6f777dc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -69,7 +69,8 @@ msgstr "Notifiche"
msgid "Written by {0}"
msgstr ""
-msgid "This article is under the {0} license."
+#, fuzzy
+msgid "This article is published under the {0} license."
msgstr "Questo articolo è rilasciato con licenza {0} ."
msgid "One like"
@@ -88,7 +89,8 @@ msgid_plural "{0} Boosts"
msgstr[0] "Un Boost"
msgstr[1] "{0} Boost"
-msgid "I don't want to boost this anymore"
+#, fuzzy
+msgid "I don't want this boosted anymore"
msgstr "Annulla boost"
msgid "Boost"
@@ -115,7 +117,8 @@ msgstr "Pubblica"
msgid "Login"
msgstr "Accedi"
-msgid "Username or email"
+#, fuzzy
+msgid "Username, or email"
msgstr "Nome utente o email"
msgid "Password"
@@ -127,7 +130,8 @@ msgstr "Pannello"
msgid "Your Dashboard"
msgstr "Il tuo Pannello"
-msgid "Your Blogs"
+#, fuzzy
+msgid "Your blogs"
msgstr "I Tuoi Blogs"
msgid "You don't have any blog yet. Create your own, or ask to join one."
@@ -141,7 +145,8 @@ msgstr "Inizia un nuovo blog"
msgid "Admin"
msgstr "Amministratore"
-msgid "It is you"
+#, fuzzy
+msgid "That's you"
msgstr "Sei tu"
msgid "Edit your profile"
@@ -222,34 +227,43 @@ msgstr "Accedi"
msgid "Register"
msgstr "Registrati"
-msgid "You need to be logged in order to create a new blog"
+#, fuzzy
+msgid "You need to be signed in, for you to create a new blog"
msgstr "Devi effettuare l'accesso per creare un nuovo blog"
-msgid "You need to be logged in order to post a comment"
+#, fuzzy
+msgid "You need to be signed in, so that you can post a comment"
msgstr "Devi effettuare l'accesso per commentare"
-msgid "You need to be logged in order to like a post"
+#, fuzzy
+msgid "You need to be signed in, in order for you to like a post"
msgstr "Devi effettuare l'accesso per mettere mi piace ad un post"
msgid "You need to be logged in order to see your notifications"
msgstr "Devi effettuare l'accesso per vedere le tue notifiche"
-msgid "You need to be logged in order to write a new post"
+#, fuzzy
+msgid "You need to be logged in, to be able to write a new post"
msgstr "Devi effettuare l'accesso per scrivere un post"
-msgid "You need to be logged in order to boost a post"
+#, fuzzy
+msgid "You need to be logged in, for you to be able to boost a post"
msgstr "Devi effettuare l'accesso per boostare un post"
-msgid "Invalid username or password"
+#, fuzzy
+msgid "Invalid username, or password"
msgstr "Nome utente o password non validi"
-msgid "You need to be logged in order to access your dashboard"
+#, fuzzy
+msgid "You need to be logged in, to be able to access your dashboard"
msgstr "Devi effettuare l'accesso per accedere al tuo pannello"
-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in, to be able to follow someone"
msgstr "Devi effettuare l'accesso per seguire qualcuno"
-msgid "You need to be logged in order to edit your profile"
+#, fuzzy
+msgid "You need to be logged in, to be able to edit your profile"
msgstr "Devi effettuare l'accesso per modificare il tuo profilo"
msgid "By {0}"
@@ -264,7 +278,8 @@ msgstr "{0} ha iniziato a seguirti"
msgid "{0} liked your article"
msgstr "{0} ha messo mi piace al tuo articolo"
-msgid "{0} commented your article"
+#, fuzzy
+msgid "{0} commented on your article"
msgstr "{0} ha commentato il tuo articolo"
msgid "We couldn't find this page."
@@ -276,7 +291,8 @@ msgstr "Il collegamento che ti ha portato qui potrebbe non essere valido."
msgid "You are not authorized."
msgstr "Non sei autorizzato."
-msgid "You are not author in this blog."
+#, fuzzy
+msgid "You are not an author on this blog."
msgstr "Non sei l'autore di questo blog."
msgid "{0} mentioned you."
@@ -300,14 +316,16 @@ msgstr "Il tuo commento non può essere vuoto"
msgid "A post with the same title already exists."
msgstr "Un post con lo stesso titolo esiste già."
-msgid "We need an email or a username to identify you"
+#, fuzzy
+msgid "We need an email, or a username to identify you"
msgstr "Occorre un indirizzo email o un nome utente per identificarti"
-msgid "Your password can't be empty"
+#, fuzzy
+msgid "Your password field can't be empty"
msgstr "La tua password non può essere vuota"
-msgid "Passwords are not matching"
-msgstr "Le password non corrispondono"
+msgid "The two passwords must be a match!"
+msgstr ""
msgid "Username can't be empty"
msgstr "Il nome utente non può essere vuoto"
@@ -315,15 +333,17 @@ msgstr "Il nome utente non può essere vuoto"
msgid "Invalid email"
msgstr "Indirizzo email non valido"
-msgid "Password should be at least 8 characters long"
+#, fuzzy
+msgid "The password should be at least 8 characters long"
msgstr "Le password devono essere lunghe almeno 8 caratteri"
-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
-msgstr[0] "Un autore in questo blog: "
-msgstr[1] "{0} autori in questo blog: "
+msgid "This blog has one author: "
+msgid_plural "This blog has {0} authors: "
+msgstr[0] ""
+msgstr[1] ""
-msgid "Login or use your Fediverse account to interact with this article"
+#, fuzzy
+msgid "Log in, or use your Fediverse account to interact with this article"
msgstr ""
"Accedi o utilizza un tuo account del Fediverso per interagire con questo "
"articolo"
@@ -331,10 +351,10 @@ msgstr ""
msgid "Optional"
msgstr "Opzionale"
-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
-msgstr[0] "Un articolo in questo blog"
-msgstr[1] "{0} articoli in questo blog"
+msgid "This blog has one article"
+msgid_plural "This blog has {0} articles"
+msgstr[0] ""
+msgstr[1] ""
msgid "Previous page"
msgstr "Pagina precedente"
@@ -357,7 +377,8 @@ msgstr "Impostazioni dell'istanza"
msgid "Allow anyone to register"
msgstr "Consenti a chiunque di registrarsi"
-msgid "Short description"
+#, fuzzy
+msgid "Short description - byline"
msgstr "Breve descrizione"
msgid "Markdown is supported"
@@ -372,7 +393,8 @@ msgstr "Licenza predefinita"
msgid "Save settings"
msgstr "Salva impostazioni"
-msgid "No comments yet. Be the first to react!"
+#, fuzzy
+msgid "There are no comments here yet. Be the first to react!"
msgstr "Ancora nessun commento. Scrivi la prima reazione!"
msgid "About this instance"
@@ -384,12 +406,15 @@ msgstr "Cos'è Plume?"
msgid "Plume is a decentralized blogging engine."
msgstr "Plume è un motore di blog decentralizzato."
-msgid "Authors can manage various blogs from an unique website."
+#, fuzzy
+msgid "Authors can manage various blogs, each from a separate, unique website."
msgstr "Gli autori possono gestire vari blog da un unico sito."
+#, fuzzy
msgid ""
-"Articles are also visible on other Plume websites, and you can interact with "
-"them directly from other platforms like Mastodon."
+"Articles are also visible on other Plume websites, called instances, and you "
+"can interact with them directly from other platforms like Mastodon, or "
+"WriteFreely."
msgstr ""
"Gli articoli sono visibili anche da altri siti Plume, e puoi interagire con "
"loro direttamente da altre piattaforme come Mastodon."
@@ -406,7 +431,7 @@ msgstr ""
msgid "Who wrote {0} articles"
msgstr ""
-msgid "And connected to {0} other instances"
+msgid "And are connected to {0} other instances"
msgstr ""
msgid "Read the detailed rules"
@@ -439,13 +464,16 @@ msgstr "Dettagli del media"
msgid "Go back to the gallery"
msgstr "Torna alla galleria"
-msgid "Markdown code"
+#, fuzzy
+msgid "Markdown syntax"
msgstr "Codice Markdown"
-msgid "Copy it in your articles to insert this media."
+#, fuzzy
+msgid "Copy it into your articles, to insert this media."
msgstr "Copialo nei tuoi articoli per inserire questo media."
-msgid "Use as avatar"
+#, fuzzy
+msgid "Use as an avatar"
msgstr "Usa come avatar"
msgid "Delete"
@@ -454,7 +482,8 @@ msgstr "Elimina"
msgid "Upload"
msgstr "Carica"
-msgid "You don't have any media yet."
+#, fuzzy
+msgid "You don't have any media uploaded yet."
msgstr "Non hai ancora nessun media."
msgid "Media upload"
@@ -472,8 +501,10 @@ msgstr "File"
msgid "Send"
msgstr "Invia"
+#, fuzzy
msgid ""
-"Sorry, but registrations are closed on this instance. Try to find another one"
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
msgstr ""
"Scusa, ma le registrazioni sono chiuse su questa istanza. Prova a cercarne "
"un'altra"
@@ -487,8 +518,9 @@ msgstr "Accedi per mettere mi piace"
msgid "Login to boost"
msgstr "Accedi per boostare"
-msgid "Your feed"
-msgstr "Il tuo flusso"
+#, fuzzy
+msgid "Personal feed"
+msgstr "Flusso locale"
msgid "Federated feed"
msgstr "Flusso federato"
@@ -496,13 +528,15 @@ msgstr "Flusso federato"
msgid "Local feed"
msgstr "Flusso locale"
-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to follow some people."
msgstr "Non c'è niente da mostrare qui. Prova a seguire più persone."
msgid "Articles"
msgstr "Articoli"
-msgid "All the articles of the Fediverse"
+#, fuzzy
+msgid "All of the articles within the Fediverse"
msgstr "Tutti gli articoli del Fediverso"
msgid "Articles from {0}"
@@ -511,7 +545,8 @@ msgstr "Articoli da {0}}"
msgid "View all"
msgstr "Vedi tutto"
-msgid "Articles tagged \"{0}\""
+#, fuzzy
+msgid "Articles tagged under \"{0}\""
msgstr "Articoli etichettati \"{0}\""
msgid "Edit"
@@ -555,10 +590,12 @@ msgstr "Blocca"
msgid "Ban"
msgstr "Banna"
-msgid "Useful for visually impaired people and licensing"
+#, fuzzy
+msgid "Useful for visually impaired people and information about licenses"
msgstr "Utile per persone ipovedenti e per informazioni sulla licenza"
-msgid "Let it empty if there is none"
+#, fuzzy
+msgid "Leave it empty, if none is meeded"
msgstr "Lascialo vuoto se non è presente nessuno"
msgid "Draft"
@@ -567,7 +604,8 @@ msgstr "Bozza"
msgid "This is a draft, don't publish it yet."
msgstr "Questa è una bozza, non pubblicarla ancora."
-msgid "Update or publish"
+#, fuzzy
+msgid "Update, or publish"
msgstr "Aggiorna o pubblica"
msgid "Your Drafts"
@@ -576,14 +614,16 @@ msgstr "Le tue Bozze"
msgid "Danger zone"
msgstr "Zona pericolosa"
-msgid "Be very careful, any action taken here can't be cancelled."
+#, fuzzy
+msgid "Be very careful, any action taken here cannot be reversed."
msgstr ""
"Fai molta attenzione, qualsiasi azione fatta qui non può essere annullata."
msgid "Delete your account"
msgstr "Elimina il tuo account"
-msgid "Sorry, but as an admin, you can't leave your instance."
+#, fuzzy
+msgid "Sorry, but as an admin, you can't leave your own instance."
msgstr ""
"Scusa, ma essendo tu un amministratore, non puoi abbandonare la tua istanza."
@@ -593,7 +633,8 @@ msgstr "Utenti"
msgid "This post isn't published yet."
msgstr "Questo post non è ancora stato pubblicato."
-msgid "There is currently no article with that tag"
+#, fuzzy
+msgid "There are currently no articles with such a tag"
msgstr "Attualmente non è ancora presente nessun articolo con quell'etichetta"
#, fuzzy
@@ -604,12 +645,28 @@ msgid "None"
msgstr ""
#, fuzzy
-msgid "Let it empty reserve all rights"
+msgid "Leave empty to reserve all rights"
msgstr "Lascialo vuoto se non è presente nessuno"
msgid "All rights reserved."
msgstr ""
+#~ msgid "Passwords are not matching"
+#~ msgstr "Le password non corrispondono"
+
+#~ msgid "One author in this blog: "
+#~ msgid_plural "{0} authors in this blog: "
+#~ msgstr[0] "Un autore in questo blog: "
+#~ msgstr[1] "{0} autori in questo blog: "
+
+#~ msgid "One article in this blog"
+#~ msgid_plural "{0} articles in this blog"
+#~ msgstr[0] "Un articolo in questo blog"
+#~ msgstr[1] "{0} articoli in questo blog"
+
+#~ msgid "Your feed"
+#~ msgstr "Il tuo flusso"
+
#~ msgid "Home to"
#~ msgstr "Casa di"
diff --git a/po/ja.po b/po/ja.po
index e61733ef..b5c9ed81 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -71,7 +71,8 @@ msgstr "通知"
msgid "Written by {0}"
msgstr "{0} さんが作成"
-msgid "This article is under the {0} license."
+#, fuzzy
+msgid "This article is published under the {0} license."
msgstr "この記事は {0} ライセンスの元で公開されています。"
msgid "One like"
@@ -88,7 +89,8 @@ msgid "One Boost"
msgid_plural "{0} Boosts"
msgstr[0] "{0} ブースト"
-msgid "I don't want to boost this anymore"
+#, fuzzy
+msgid "I don't want this boosted anymore"
msgstr "もうこれをブーストしたくありません"
msgid "Boost"
@@ -115,7 +117,8 @@ msgstr "公開"
msgid "Login"
msgstr "ログイン"
-msgid "Username or email"
+#, fuzzy
+msgid "Username, or email"
msgstr "ユーザー名またはメールアドレス"
msgid "Password"
@@ -127,7 +130,8 @@ msgstr "ダッシュボード"
msgid "Your Dashboard"
msgstr "自分のダッシュボード"
-msgid "Your Blogs"
+#, fuzzy
+msgid "Your blogs"
msgstr "自分のブログ"
msgid "You don't have any blog yet. Create your own, or ask to join one."
@@ -141,7 +145,8 @@ msgstr "新しいブログを開始"
msgid "Admin"
msgstr "管理者"
-msgid "It is you"
+#, fuzzy
+msgid "That's you"
msgstr "自分"
msgid "Edit your profile"
@@ -220,34 +225,43 @@ msgstr "ログイン"
msgid "Register"
msgstr "登録"
-msgid "You need to be logged in order to create a new blog"
+#, fuzzy
+msgid "You need to be signed in, for you to create a new blog"
msgstr "新しいブログを作成するにはログインする必要があります"
-msgid "You need to be logged in order to post a comment"
+#, fuzzy
+msgid "You need to be signed in, so that you can post a comment"
msgstr "コメントを投稿するにはログインする必要があります"
-msgid "You need to be logged in order to like a post"
+#, fuzzy
+msgid "You need to be signed in, in order for you to like a post"
msgstr "投稿をいいねするにはログインする必要があります"
msgid "You need to be logged in order to see your notifications"
msgstr "通知を表示するにはログインする必要があります"
-msgid "You need to be logged in order to write a new post"
+#, fuzzy
+msgid "You need to be logged in, to be able to write a new post"
msgstr "新しい記事を書くにはログインする必要があります"
-msgid "You need to be logged in order to boost a post"
+#, fuzzy
+msgid "You need to be logged in, for you to be able to boost a post"
msgstr "投稿をブーストするにはログインする必要があります"
-msgid "Invalid username or password"
+#, fuzzy
+msgid "Invalid username, or password"
msgstr "ユーザー名またはパスワードが間違っています"
-msgid "You need to be logged in order to access your dashboard"
+#, fuzzy
+msgid "You need to be logged in, to be able to access your dashboard"
msgstr "ダッシュボードにアクセスするにはログインする必要があります"
-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in, to be able to follow someone"
msgstr "他の人をフォローするにはログインする必要があります"
-msgid "You need to be logged in order to edit your profile"
+#, fuzzy
+msgid "You need to be logged in, to be able to edit your profile"
msgstr "自分のプロフィールを編集するにはログインする必要があります"
msgid "By {0}"
@@ -262,7 +276,8 @@ msgstr "{0} さんがあなたのフォローを開始しました"
msgid "{0} liked your article"
msgstr "{0} さんがあなたの記事をいいねしました"
-msgid "{0} commented your article"
+#, fuzzy
+msgid "{0} commented on your article"
msgstr "{0} さんがあなたの記事にコメントしました"
msgid "We couldn't find this page."
@@ -274,7 +289,8 @@ msgstr "このリンクは切れている可能性があります。"
msgid "You are not authorized."
msgstr "認証されていません。"
-msgid "You are not author in this blog."
+#, fuzzy
+msgid "You are not an author on this blog."
msgstr "あなたはこのブログの作者ではありません。"
msgid "{0} mentioned you."
@@ -298,14 +314,16 @@ msgstr "コメントは空にできません"
msgid "A post with the same title already exists."
msgstr "同じタイトルの投稿がすでに存在します。"
-msgid "We need an email or a username to identify you"
+#, fuzzy
+msgid "We need an email, or a username to identify you"
msgstr "あなたを識別するために、メールアドレスかユーザー名が必要です"
-msgid "Your password can't be empty"
+#, fuzzy
+msgid "Your password field can't be empty"
msgstr "パスワードは空にできません"
-msgid "Passwords are not matching"
-msgstr "パスワードが一致しません"
+msgid "The two passwords must be a match!"
+msgstr ""
msgid "Username can't be empty"
msgstr "ユーザー名は空にできません"
@@ -313,23 +331,25 @@ msgstr "ユーザー名は空にできません"
msgid "Invalid email"
msgstr "無効なメールアドレス"
-msgid "Password should be at least 8 characters long"
+#, fuzzy
+msgid "The password should be at least 8 characters long"
msgstr "パスワードは最低 8 文字にするべきです"
-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
-msgstr[0] "ブログに {0} 人の作成者がいます: "
+msgid "This blog has one author: "
+msgid_plural "This blog has {0} authors: "
+msgstr[0] ""
-msgid "Login or use your Fediverse account to interact with this article"
+#, fuzzy
+msgid "Log in, or use your Fediverse account to interact with this article"
msgstr ""
"この記事と関わるには、ログインするか Fediverse アカウントを使用してください"
msgid "Optional"
msgstr "省略可"
-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
-msgstr[0] "ブログに {0} 件の記事があります"
+msgid "This blog has one article"
+msgid_plural "This blog has {0} articles"
+msgstr[0] ""
msgid "Previous page"
msgstr "前のページ"
@@ -352,7 +372,8 @@ msgstr "インスタンスの設定"
msgid "Allow anyone to register"
msgstr "不特定多数に登録を許可"
-msgid "Short description"
+#, fuzzy
+msgid "Short description - byline"
msgstr "短い説明"
msgid "Markdown is supported"
@@ -367,7 +388,8 @@ msgstr "デフォルトのライセンス"
msgid "Save settings"
msgstr "設定を保存"
-msgid "No comments yet. Be the first to react!"
+#, fuzzy
+msgid "There are no comments here yet. Be the first to react!"
msgstr "コメントがまだありません。最初のコメントを書きましょう！"
msgid "About this instance"
@@ -379,12 +401,15 @@ msgstr "Plume とは？"
msgid "Plume is a decentralized blogging engine."
msgstr "Plume は、分散型のブログエンジンです。"
-msgid "Authors can manage various blogs from an unique website."
+#, fuzzy
+msgid "Authors can manage various blogs, each from a separate, unique website."
msgstr "作成者は、ある固有の Web サイトから、さまざまなブログを管理できます。"
+#, fuzzy
msgid ""
-"Articles are also visible on other Plume websites, and you can interact with "
-"them directly from other platforms like Mastodon."
+"Articles are also visible on other Plume websites, called instances, and you "
+"can interact with them directly from other platforms like Mastodon, or "
+"WriteFreely."
msgstr ""
"記事は他の Plume Web サイトからも閲覧可能であり、Mastdon のように他のプラット"
"フォームから直接記事と関わることができます。"
@@ -401,7 +426,8 @@ msgstr "登録者数 {0} 人"
msgid "Who wrote {0} articles"
msgstr "投稿記事数 {0} 件"
-msgid "And connected to {0} other instances"
+#, fuzzy
+msgid "And are connected to {0} other instances"
msgstr "他のインスタンスからの接続数 {0} 件"
msgid "Read the detailed rules"
@@ -434,13 +460,16 @@ msgstr "メディアの詳細"
msgid "Go back to the gallery"
msgstr "ライブラリに戻る"
-msgid "Markdown code"
+#, fuzzy
+msgid "Markdown syntax"
msgstr "Markdown コード"
-msgid "Copy it in your articles to insert this media."
+#, fuzzy
+msgid "Copy it into your articles, to insert this media."
msgstr "このメディアを記事に挿入するには、自分の記事にコピーしてください。"
-msgid "Use as avatar"
+#, fuzzy
+msgid "Use as an avatar"
msgstr "アバターとして使う"
msgid "Delete"
@@ -449,7 +478,8 @@ msgstr "削除"
msgid "Upload"
msgstr "アップロード"
-msgid "You don't have any media yet."
+#, fuzzy
+msgid "You don't have any media uploaded yet."
msgstr "メディアがまだありません。"
msgid "Media upload"
@@ -467,8 +497,10 @@ msgstr "ファイル"
msgid "Send"
msgstr "送信"
+#, fuzzy
msgid ""
-"Sorry, but registrations are closed on this instance. Try to find another one"
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
msgstr ""
"申し訳ありませんが、このインスタンスでは登録者は限定されています。別のインス"
"タンスをお探しください"
@@ -482,8 +514,9 @@ msgstr "いいねするにはログインしてください"
msgid "Login to boost"
msgstr "ブーストするにはログインしてください"
-msgid "Your feed"
-msgstr "自分のフィード"
+#, fuzzy
+msgid "Personal feed"
+msgstr "このインスタンスのフィード"
msgid "Federated feed"
msgstr "全インスタンスのフィード"
@@ -491,7 +524,8 @@ msgstr "全インスタンスのフィード"
msgid "Local feed"
msgstr "このインスタンスのフィード"
-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to follow some people."
msgstr ""
"ここにはまだ表示できるものがありません。他の人をもっとフォローしてみてくださ"
"い。"
@@ -499,7 +533,8 @@ msgstr ""
msgid "Articles"
msgstr "記事"
-msgid "All the articles of the Fediverse"
+#, fuzzy
+msgid "All of the articles within the Fediverse"
msgstr "Fediverse のすべての記事"
msgid "Articles from {0}"
@@ -508,7 +543,8 @@ msgstr "{0} の記事"
msgid "View all"
msgstr "すべて表示"
-msgid "Articles tagged \"{0}\""
+#, fuzzy
+msgid "Articles tagged under \"{0}\""
msgstr "\"{0}\" タグの記事"
msgid "Edit"
@@ -550,10 +586,12 @@ msgstr "ブロック"
msgid "Ban"
msgstr "禁止"
-msgid "Useful for visually impaired people and licensing"
+#, fuzzy
+msgid "Useful for visually impaired people and information about licenses"
msgstr "視覚的に障害のある方や認可の際に便利です"
-msgid "Let it empty if there is none"
+#, fuzzy
+msgid "Leave it empty, if none is meeded"
msgstr "不要な場合は空にしてください"
msgid "Draft"
@@ -562,7 +600,8 @@ msgstr "下書き"
msgid "This is a draft, don't publish it yet."
msgstr "これは下書きなので、まだ公開しないでください。"
-msgid "Update or publish"
+#, fuzzy
+msgid "Update, or publish"
msgstr "更新または公開"
msgid "Your Drafts"
@@ -571,13 +610,15 @@ msgstr "下書き"
msgid "Danger zone"
msgstr "危険"
-msgid "Be very careful, any action taken here can't be cancelled."
+#, fuzzy
+msgid "Be very careful, any action taken here cannot be reversed."
msgstr "十分ご注意ください。ここで行ったすべての操作は取り消しできません。"
msgid "Delete your account"
msgstr "アカウントを削除"
-msgid "Sorry, but as an admin, you can't leave your instance."
+#, fuzzy
+msgid "Sorry, but as an admin, you can't leave your own instance."
msgstr "申し訳ありませんが、管理者として、自分のインスタンスを離脱できません。"
msgid "Users"
@@ -586,7 +627,8 @@ msgstr "ユーザー"
msgid "This post isn't published yet."
msgstr "この投稿はまだ公開されていません。"
-msgid "There is currently no article with that tag"
+#, fuzzy
+msgid "There are currently no articles with such a tag"
msgstr "そのタグのある記事は現在ありません"
msgid "Illustration"
@@ -596,12 +638,26 @@ msgid "None"
msgstr "なし"
#, fuzzy
-msgid "Let it empty reserve all rights"
+msgid "Leave empty to reserve all rights"
msgstr "不要な場合は空にしてください"
msgid "All rights reserved."
msgstr ""
+#~ msgid "Passwords are not matching"
+#~ msgstr "パスワードが一致しません"
+
+#~ msgid "One author in this blog: "
+#~ msgid_plural "{0} authors in this blog: "
+#~ msgstr[0] "ブログに {0} 人の作成者がいます: "
+
+#~ msgid "One article in this blog"
+#~ msgid_plural "{0} articles in this blog"
+#~ msgstr[0] "ブログに {0} 件の記事があります"
+
+#~ msgid "Your feed"
+#~ msgstr "自分のフィード"
+
#~ msgid "Welcome to {{ instance_name | escape }}"
#~ msgstr "{{ instance_name | escape }} へようこそ"
diff --git a/po/nb.po b/po/nb.po
index e81840bc..da8986c8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -71,7 +71,8 @@ msgstr "Meldinger"
msgid "Written by {0}"
msgstr ""
-msgid "This article is under the {0} license."
+#, fuzzy
+msgid "This article is published under the {0} license."
msgstr "Denne artikkelen er publisert med lisensen {0}"
msgid "One like"
@@ -90,7 +91,8 @@ msgid_plural "{0} Boosts"
msgstr[0] ""
msgstr[1] ""
-msgid "I don't want to boost this anymore"
+#, fuzzy
+msgid "I don't want this boosted anymore"
msgstr "Jeg ønsker ikke å dele dette lengre"
msgid "Boost"
@@ -117,7 +119,8 @@ msgstr "Publisér"
msgid "Login"
msgstr "Logg inn"
-msgid "Username or email"
+#, fuzzy
+msgid "Username, or email"
msgstr "Brukernavn eller epost"
msgid "Password"
@@ -129,7 +132,8 @@ msgstr "Oversikt"
msgid "Your Dashboard"
msgstr "Din oversikt"
-msgid "Your Blogs"
+#, fuzzy
+msgid "Your blogs"
msgstr "Dine blogger"
msgid "You don't have any blog yet. Create your own, or ask to join one."
@@ -143,7 +147,8 @@ msgstr "Start en ny blogg"
msgid "Admin"
msgstr "Administrator"
-msgid "It is you"
+#, fuzzy
+msgid "That's you"
msgstr "Dette er deg"
msgid "Edit your profile"
@@ -224,35 +229,43 @@ msgstr "Logg inn"
msgid "Register"
msgstr "Registrér deg"
-msgid "You need to be logged in order to create a new blog"
+#, fuzzy
+msgid "You need to be signed in, for you to create a new blog"
msgstr "Du må være logget inn for å lage en ny blogg"
-msgid "You need to be logged in order to post a comment"
+#, fuzzy
+msgid "You need to be signed in, so that you can post a comment"
msgstr "Du må være logget inn for å legge inn en kommentar"
-msgid "You need to be logged in order to like a post"
+#, fuzzy
+msgid "You need to be signed in, in order for you to like a post"
msgstr "Du må være logget inn for å like et innlegg"
msgid "You need to be logged in order to see your notifications"
msgstr "Du må være logget inn for å se meldingene dine"
-msgid "You need to be logged in order to write a new post"
+#, fuzzy
+msgid "You need to be logged in, to be able to write a new post"
msgstr "Du må være logget inn for å skrive et nytt innlegg"
#, fuzzy
-msgid "You need to be logged in order to boost a post"
+msgid "You need to be logged in, for you to be able to boost a post"
msgstr "Du må være logget inn for å like et innlegg"
-msgid "Invalid username or password"
+#, fuzzy
+msgid "Invalid username, or password"
msgstr "Ugyldig brukernavn eller passord"
-msgid "You need to be logged in order to access your dashboard"
+#, fuzzy
+msgid "You need to be logged in, to be able to access your dashboard"
msgstr "Du må være logget inn for å få tilgang til oversikten din"
-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in, to be able to follow someone"
msgstr "Du må være logget inn for å følge noen"
-msgid "You need to be logged in order to edit your profile"
+#, fuzzy
+msgid "You need to be logged in, to be able to edit your profile"
msgstr "Du må være logget inn for å redigere profilen din"
msgid "By {0}"
@@ -267,7 +280,8 @@ msgstr "{0} har begynt å følge deg"
msgid "{0} liked your article"
msgstr "{0} likte artikkelen din"
-msgid "{0} commented your article"
+#, fuzzy
+msgid "{0} commented on your article"
msgstr "{0} la inn en kommentar til artikkelen din"
msgid "We couldn't find this page."
@@ -279,7 +293,8 @@ msgstr "Kanhende lenken som førte deg hit er ødelagt."
msgid "You are not authorized."
msgstr "Det har du har ikke tilgang til."
-msgid "You are not author in this blog."
+#, fuzzy
+msgid "You are not an author on this blog."
msgstr "Du er ikke denne bloggens forfatter."
msgid "{0} mentioned you."
@@ -303,14 +318,16 @@ msgstr "Kommentaren din kan ikke være tom"
msgid "A post with the same title already exists."
msgstr "Et innlegg med samme navn finnes allerede."
-msgid "We need an email or a username to identify you"
+#, fuzzy
+msgid "We need an email, or a username to identify you"
msgstr "Vi trenger en epost eller et brukernavn for å identifisere deg"
-msgid "Your password can't be empty"
+#, fuzzy
+msgid "Your password field can't be empty"
msgstr "Kommentaren din kan ikke være tom"
-msgid "Passwords are not matching"
-msgstr "Passordene stemmer ikke overens"
+msgid "The two passwords must be a match!"
+msgstr ""
msgid "Username can't be empty"
msgstr "Brukernavnet kan ikke være tomt"
@@ -318,25 +335,27 @@ msgstr "Brukernavnet kan ikke være tomt"
msgid "Invalid email"
msgstr "Ugyldig epost"
-msgid "Password should be at least 8 characters long"
+#, fuzzy
+msgid "The password should be at least 8 characters long"
msgstr "Passord må bestå av minst åtte tegn"
-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
-msgstr[0] "Én forfatter av denne bloggen: "
-msgstr[1] "{0} forfattere av denne bloggen: "
+msgid "This blog has one author: "
+msgid_plural "This blog has {0} authors: "
+msgstr[0] ""
+msgstr[1] ""
-msgid "Login or use your Fediverse account to interact with this article"
+#, fuzzy
+msgid "Log in, or use your Fediverse account to interact with this article"
msgstr ""
"Logg inn eller bruk din Fediverse-konto for å gjøre noe med denne artikkelen"
msgid "Optional"
msgstr "Valgfritt"
-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
-msgstr[0] "Én artikkel i denne bloggen"
-msgstr[1] "{0} artikler i denne bloggen"
+msgid "This blog has one article"
+msgid_plural "This blog has {0} articles"
+msgstr[0] ""
+msgstr[1] ""
msgid "Previous page"
msgstr "Forrige side"
@@ -359,7 +378,8 @@ msgstr "Instillinger for instansen"
msgid "Allow anyone to register"
msgstr "Tillat at hvem som helst registrerer seg"
-msgid "Short description"
+#, fuzzy
+msgid "Short description - byline"
msgstr "Kort beskrivelse"
msgid "Markdown is supported"
@@ -374,7 +394,8 @@ msgstr "Standardlisens"
msgid "Save settings"
msgstr "Lagre innstillingene"
-msgid "No comments yet. Be the first to react!"
+#, fuzzy
+msgid "There are no comments here yet. Be the first to react!"
msgstr "Ingen kommentarer enda. Vær den første!"
msgid "About this instance"
@@ -386,12 +407,15 @@ msgstr "Hva er Plume?"
msgid "Plume is a decentralized blogging engine."
msgstr "Plume er et desentralisert bloggsystem."
-msgid "Authors can manage various blogs from an unique website."
+#, fuzzy
+msgid "Authors can manage various blogs, each from a separate, unique website."
msgstr "Forfattere kan administrere forskjellige blogger fra en unik webside."
+#, fuzzy
msgid ""
-"Articles are also visible on other Plume websites, and you can interact with "
-"them directly from other platforms like Mastodon."
+"Articles are also visible on other Plume websites, called instances, and you "
+"can interact with them directly from other platforms like Mastodon, or "
+"WriteFreely."
msgstr ""
"Artiklene er også synlige på andre websider som kjører Plume, og du kan "
"interagere med dem direkte fra andre plattformer som f.eks. Mastodon."
@@ -408,7 +432,7 @@ msgstr ""
msgid "Who wrote {0} articles"
msgstr ""
-msgid "And connected to {0} other instances"
+msgid "And are connected to {0} other instances"
msgstr ""
msgid "Read the detailed rules"
@@ -445,13 +469,13 @@ msgid "Go back to the gallery"
msgstr ""
#, fuzzy
-msgid "Markdown code"
+msgid "Markdown syntax"
msgstr "Du kan bruke markdown"
-msgid "Copy it in your articles to insert this media."
+msgid "Copy it into your articles, to insert this media."
msgstr ""
-msgid "Use as avatar"
+msgid "Use as an avatar"
msgstr ""
msgid "Delete"
@@ -460,7 +484,7 @@ msgstr ""
msgid "Upload"
msgstr ""
-msgid "You don't have any media yet."
+msgid "You don't have any media uploaded yet."
msgstr ""
msgid "Media upload"
@@ -481,7 +505,8 @@ msgid "Send"
msgstr ""
msgid ""
-"Sorry, but registrations are closed on this instance. Try to find another one"
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
msgstr ""
#, fuzzy
@@ -494,9 +519,8 @@ msgstr ""
msgid "Login to boost"
msgstr ""
-#, fuzzy
-msgid "Your feed"
-msgstr "Din kommentar"
+msgid "Personal feed"
+msgstr ""
msgid "Federated feed"
msgstr ""
@@ -504,14 +528,14 @@ msgstr ""
msgid "Local feed"
msgstr ""
-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to follow some people."
msgstr ""
#, fuzzy
msgid "Articles"
msgstr "artikler"
-msgid "All the articles of the Fediverse"
+msgid "All of the articles within the Fediverse"
msgstr ""
#, fuzzy
@@ -522,7 +546,7 @@ msgid "View all"
msgstr ""
#, fuzzy
-msgid "Articles tagged \"{0}\""
+msgid "Articles tagged under \"{0}\""
msgstr "Om {0}"
msgid "Edit"
@@ -566,10 +590,10 @@ msgstr ""
msgid "Ban"
msgstr ""
-msgid "Useful for visually impaired people and licensing"
+msgid "Useful for visually impaired people and information about licenses"
msgstr ""
-msgid "Let it empty if there is none"
+msgid "Leave it empty, if none is meeded"
msgstr ""
msgid "Draft"
@@ -578,7 +602,7 @@ msgstr ""
msgid "This is a draft, don't publish it yet."
msgstr ""
-msgid "Update or publish"
+msgid "Update, or publish"
msgstr ""
#, fuzzy
@@ -588,14 +612,14 @@ msgstr "Din oversikt"
msgid "Danger zone"
msgstr ""
-msgid "Be very careful, any action taken here can't be cancelled."
+msgid "Be very careful, any action taken here cannot be reversed."
msgstr ""
#, fuzzy
msgid "Delete your account"
msgstr "Opprett din konto"
-msgid "Sorry, but as an admin, you can't leave your instance."
+msgid "Sorry, but as an admin, you can't leave your own instance."
msgstr ""
#, fuzzy
@@ -605,7 +629,7 @@ msgstr "Brukernavn"
msgid "This post isn't published yet."
msgstr ""
-msgid "There is currently no article with that tag"
+msgid "There are currently no articles with such a tag"
msgstr ""
#, fuzzy
@@ -615,12 +639,29 @@ msgstr "Administrasjon"
msgid "None"
msgstr ""
-msgid "Let it empty reserve all rights"
+msgid "Leave empty to reserve all rights"
msgstr ""
msgid "All rights reserved."
msgstr ""
+#~ msgid "Passwords are not matching"
+#~ msgstr "Passordene stemmer ikke overens"
+
+#~ msgid "One author in this blog: "
+#~ msgid_plural "{0} authors in this blog: "
+#~ msgstr[0] "Én forfatter av denne bloggen: "
+#~ msgstr[1] "{0} forfattere av denne bloggen: "
+
+#~ msgid "One article in this blog"
+#~ msgid_plural "{0} articles in this blog"
+#~ msgstr[0] "Én artikkel i denne bloggen"
+#~ msgstr[1] "{0} artikler i denne bloggen"
+
+#, fuzzy
+#~ msgid "Your feed"
+#~ msgstr "Din kommentar"
+
#~ msgid "Home to"
#~ msgstr "Hjem for"
diff --git a/po/pl.po b/po/pl.po
index 28941cc3..47c2f3a3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -72,7 +72,8 @@ msgstr "Powiadomienia"
msgid "Written by {0}"
msgstr "Napisany przez {0}"
-msgid "This article is under the {0} license."
+#, fuzzy
+msgid "This article is published under the {0} license."
msgstr "Ten artykuł został opublikowany na licencji {0}."
msgid "One like"
@@ -93,7 +94,8 @@ msgstr[0] "Jedno podbicie"
msgstr[1] "{0} podbicia"
msgstr[2] "{0} podbić"
-msgid "I don't want to boost this anymore"
+#, fuzzy
+msgid "I don't want this boosted anymore"
msgstr "Cofnij podbicie"
msgid "Boost"
@@ -120,7 +122,8 @@ msgstr "Opublikuj"
msgid "Login"
msgstr "Logowanie"
-msgid "Username or email"
+#, fuzzy
+msgid "Username, or email"
msgstr "Nazwa użytkownika lub adres e-mail"
msgid "Password"
@@ -132,7 +135,8 @@ msgstr "Panel"
msgid "Your Dashboard"
msgstr "Twój panel"
-msgid "Your Blogs"
+#, fuzzy
+msgid "Your blogs"
msgstr "Twoje blogi"
msgid "You don't have any blog yet. Create your own, or ask to join one."
@@ -146,7 +150,8 @@ msgstr "Utwórz nowy blog"
msgid "Admin"
msgstr "Administrator"
-msgid "It is you"
+#, fuzzy
+msgid "That's you"
msgstr "To Ty"
msgid "Edit your profile"
@@ -227,34 +232,43 @@ msgstr "Zaloguj się"
msgid "Register"
msgstr "Zarejestruj się"
-msgid "You need to be logged in order to create a new blog"
+#, fuzzy
+msgid "You need to be signed in, for you to create a new blog"
msgstr "Musisz się zalogować, aby utworzyć nowy blog"
-msgid "You need to be logged in order to post a comment"
+#, fuzzy
+msgid "You need to be signed in, so that you can post a comment"
msgstr "Musisz się zalogować, aby umieścić komentarz"
-msgid "You need to be logged in order to like a post"
+#, fuzzy
+msgid "You need to be signed in, in order for you to like a post"
msgstr "Musisz się zalogować, aby polubić wpis"
msgid "You need to be logged in order to see your notifications"
msgstr "Musisz się zalogować, aby zobaczyć swoje powiadomienia"
-msgid "You need to be logged in order to write a new post"
+#, fuzzy
+msgid "You need to be logged in, to be able to write a new post"
msgstr "Musisz się zalogować, aby utworzyć wpis"
-msgid "You need to be logged in order to boost a post"
+#, fuzzy
+msgid "You need to be logged in, for you to be able to boost a post"
msgstr "Musisz się zalogować, aby podbić wpis"
-msgid "Invalid username or password"
+#, fuzzy
+msgid "Invalid username, or password"
msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
-msgid "You need to be logged in order to access your dashboard"
+#, fuzzy
+msgid "You need to be logged in, to be able to access your dashboard"
msgstr "Musisz się zalogować, aby uzyskać dostęp do panelu"
-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in, to be able to follow someone"
msgstr "Musisz się zalogować, aby zacząć obserwować innych"
-msgid "You need to be logged in order to edit your profile"
+#, fuzzy
+msgid "You need to be logged in, to be able to edit your profile"
msgstr "Musisz się zalogować , aby móc edytować swój profil"
msgid "By {0}"
@@ -269,7 +283,8 @@ msgstr "{0} zaczął(-ęła) Cię obserwować"
msgid "{0} liked your article"
msgstr "{0} polubił(a) Twój artykuł"
-msgid "{0} commented your article"
+#, fuzzy
+msgid "{0} commented on your article"
msgstr "{0} skomentował(a) Twój artykuł"
msgid "We couldn't find this page."
@@ -281,7 +296,8 @@ msgstr "Odnośnik który Cię tu zaprowadził może być uszkodzony."
msgid "You are not authorized."
msgstr "Nie jesteś zalogowany."
-msgid "You are not author in this blog."
+#, fuzzy
+msgid "You are not an author on this blog."
msgstr "Nie jesteś autorem tego bloga."
msgid "{0} mentioned you."
@@ -305,15 +321,17 @@ msgstr "Twój komentarz nie może być pusty"
msgid "A post with the same title already exists."
msgstr "Wpis o tym tytule już istnieje."
-msgid "We need an email or a username to identify you"
+#, fuzzy
+msgid "We need an email, or a username to identify you"
msgstr ""
"Potrzebujemy nazwy użytkownika lub adresu e-mail, aby Cię zidentyfikować"
-msgid "Your password can't be empty"
+#, fuzzy
+msgid "Your password field can't be empty"
msgstr "Twoje hasło nie może być puste"
-msgid "Passwords are not matching"
-msgstr "Hasła nie pasują do siebie"
+msgid "The two passwords must be a match!"
+msgstr ""
msgid "Username can't be empty"
msgstr "Nazwa użytkownika nie może być pusta"
@@ -321,16 +339,18 @@ msgstr "Nazwa użytkownika nie może być pusta"
msgid "Invalid email"
msgstr "Nieprawidłowy adres e-mail"
-msgid "Password should be at least 8 characters long"
+#, fuzzy
+msgid "The password should be at least 8 characters long"
msgstr "Hasło musi składać się z przynajmniej 8 znaków"
-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
-msgstr[0] "Ten blog ma jednego autora: "
-msgstr[1] "Ten blog ma {0} autorów: "
-msgstr[2] "Ten blog ma {0} autorów: "
+msgid "This blog has one author: "
+msgid_plural "This blog has {0} authors: "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-msgid "Login or use your Fediverse account to interact with this article"
+#, fuzzy
+msgid "Log in, or use your Fediverse account to interact with this article"
msgstr ""
"Zaloguj się lub użyj konta w Fediwersum, aby wejść w interakcje z tym "
"artykułem"
@@ -338,11 +358,11 @@ msgstr ""
msgid "Optional"
msgstr "Nieobowiązkowe"
-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
-msgstr[0] "Jeden artykuł na tym blogu"
-msgstr[1] "{0} artykuły na tym blogu"
-msgstr[2] "{0} artykułów na tym blogu"
+msgid "This blog has one article"
+msgid_plural "This blog has {0} articles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
msgid "Previous page"
msgstr "Poprzednia strona"
@@ -365,7 +385,8 @@ msgstr "Ustawienia instancji"
msgid "Allow anyone to register"
msgstr "Pozwól każdemu na rejestrację"
-msgid "Short description"
+#, fuzzy
+msgid "Short description - byline"
msgstr "Krótki opis"
msgid "Markdown is supported"
@@ -380,7 +401,8 @@ msgstr "Domyślna licencja"
msgid "Save settings"
msgstr "Zapisz ustawienia"
-msgid "No comments yet. Be the first to react!"
+#, fuzzy
+msgid "There are no comments here yet. Be the first to react!"
msgstr "Brak komentarzy. Bądź pierwszy!"
msgid "About this instance"
@@ -392,12 +414,15 @@ msgstr "Czym jest Plume?"
msgid "Plume is a decentralized blogging engine."
msgstr "Plume jest zdecentralizowanym silnikiem blogowym."
-msgid "Authors can manage various blogs from an unique website."
+#, fuzzy
+msgid "Authors can manage various blogs, each from a separate, unique website."
msgstr "Autorzy mogą zarządzać blogami ze specjalnej strony."
+#, fuzzy
msgid ""
-"Articles are also visible on other Plume websites, and you can interact with "
-"them directly from other platforms like Mastodon."
+"Articles are also visible on other Plume websites, called instances, and you "
+"can interact with them directly from other platforms like Mastodon, or "
+"WriteFreely."
msgstr ""
"Artykuły są widoczne na innych stronach Plume, możesz też wejść w interakcje "
"z nimi na platformach takich jak Mastodon."
@@ -414,7 +439,8 @@ msgstr "Używana przez {0} użytkowników"
msgid "Who wrote {0} articles"
msgstr "Którzy napisali {0} artykułów"
-msgid "And connected to {0} other instances"
+#, fuzzy
+msgid "And are connected to {0} other instances"
msgstr "Połączona z {0} innych instancji"
msgid "Read the detailed rules"
@@ -447,13 +473,16 @@ msgstr "Szczegóły zawartości multimedialnej"
msgid "Go back to the gallery"
msgstr "Powróć do galerii"
-msgid "Markdown code"
+#, fuzzy
+msgid "Markdown syntax"
msgstr "Kod Markdown"
-msgid "Copy it in your articles to insert this media."
+#, fuzzy
+msgid "Copy it into your articles, to insert this media."
msgstr "Skopiuj do swoich artykułów, aby wstawić tę zawartość multimedialną."
-msgid "Use as avatar"
+#, fuzzy
+msgid "Use as an avatar"
msgstr "Użyj jako awataru"
msgid "Delete"
@@ -462,7 +491,8 @@ msgstr "Usuń"
msgid "Upload"
msgstr "Wyślij"
-msgid "You don't have any media yet."
+#, fuzzy
+msgid "You don't have any media uploaded yet."
msgstr "Nie masz żadnej zawartości multimedialnej."
msgid "Media upload"
@@ -480,8 +510,10 @@ msgstr "Plik"
msgid "Send"
msgstr "Wyślij"
+#, fuzzy
msgid ""
-"Sorry, but registrations are closed on this instance. Try to find another one"
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
msgstr ""
"Przepraszamy, rejestracja jest zamknięta na tej instancji. Spróbuj znaleźć "
"inną"
@@ -495,8 +527,9 @@ msgstr "Zaloguj się aby polubić"
msgid "Login to boost"
msgstr "Zaloguj się aby podbić"
-msgid "Your feed"
-msgstr "Twój strumień"
+#, fuzzy
+msgid "Personal feed"
+msgstr "Lokalny strumień"
msgid "Federated feed"
msgstr "Strumień federacji"
@@ -504,13 +537,15 @@ msgstr "Strumień federacji"
msgid "Local feed"
msgstr "Lokalny strumień"
-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to follow some people."
msgstr "Nie ma tutaj niczego. Spróbuj zacząć śledzić więcej osób."
msgid "Articles"
msgstr "Artykuły"
-msgid "All the articles of the Fediverse"
+#, fuzzy
+msgid "All of the articles within the Fediverse"
msgstr "Wszystkie artykuły w Fediwersum"
msgid "Articles from {0}"
@@ -519,7 +554,8 @@ msgstr "Artykuły z {0}"
msgid "View all"
msgstr "Zobacz wszystko"
-msgid "Articles tagged \"{0}\""
+#, fuzzy
+msgid "Articles tagged under \"{0}\""
msgstr "Artykuły oznaczone „{0}”"
msgid "Edit"
@@ -561,10 +597,12 @@ msgstr "Zablikuj"
msgid "Ban"
msgstr "Zbanuj"
-msgid "Useful for visually impaired people and licensing"
+#, fuzzy
+msgid "Useful for visually impaired people and information about licenses"
msgstr "Przydatny dla osób z problemami ze wzrokiem i na informacje o licencji"
-msgid "Let it empty if there is none"
+#, fuzzy
+msgid "Leave it empty, if none is meeded"
msgstr "Pozostaw puste, jeżeli niepotrzebne"
msgid "Draft"
@@ -573,7 +611,8 @@ msgstr "Szkic"
msgid "This is a draft, don't publish it yet."
msgstr "To jest szkic, nie publikuj go jeszcze."
-msgid "Update or publish"
+#, fuzzy
+msgid "Update, or publish"
msgstr "Aktualizuj lub publikuj"
msgid "Your Drafts"
@@ -582,13 +621,15 @@ msgstr "Twoje szkice"
msgid "Danger zone"
msgstr "Niebezpieczna strefa"
-msgid "Be very careful, any action taken here can't be cancelled."
+#, fuzzy
+msgid "Be very careful, any action taken here cannot be reversed."
msgstr "Bądź ostrożny(-a), działania podjęte tutaj nie mogą zostać cofnięte."
msgid "Delete your account"
msgstr "Usuń swoje konto"
-msgid "Sorry, but as an admin, you can't leave your instance."
+#, fuzzy
+msgid "Sorry, but as an admin, you can't leave your own instance."
msgstr "Przepraszamy, jako administrator nie możesz opuścić swojej instancji."
msgid "Users"
@@ -597,7 +638,8 @@ msgstr "Użytkownicy"
msgid "This post isn't published yet."
msgstr "Ten wpis nie został jeszcze opublikowany."
-msgid "There is currently no article with that tag"
+#, fuzzy
+msgid "There are currently no articles with such a tag"
msgstr "Obecnie nie istnieją artykuły z tym tagiem"
msgid "Illustration"
@@ -606,12 +648,31 @@ msgstr "Ilustracja"
msgid "None"
msgstr "Brak"
-msgid "Let it empty reserve all rights"
+#, fuzzy
+msgid "Leave empty to reserve all rights"
msgstr "Pozostawienie pustego jest równe zastrzeżeniu wszystkich praw"
msgid "All rights reserved."
msgstr "Wszelkie prawa zastrzeżone"
+#~ msgid "Passwords are not matching"
+#~ msgstr "Hasła nie pasują do siebie"
+
+#~ msgid "One author in this blog: "
+#~ msgid_plural "{0} authors in this blog: "
+#~ msgstr[0] "Ten blog ma jednego autora: "
+#~ msgstr[1] "Ten blog ma {0} autorów: "
+#~ msgstr[2] "Ten blog ma {0} autorów: "
+
+#~ msgid "One article in this blog"
+#~ msgid_plural "{0} articles in this blog"
+#~ msgstr[0] "Jeden artykuł na tym blogu"
+#~ msgstr[1] "{0} artykuły na tym blogu"
+#~ msgstr[2] "{0} artykułów na tym blogu"
+
+#~ msgid "Your feed"
+#~ msgstr "Twój strumień"
+
#~ msgid "Home to"
#~ msgstr "Dom dla"
diff --git a/po/ru.po b/po/ru.po
index 8d977ac6..30426b66 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -73,7 +73,8 @@ msgstr "Уведомления"
msgid "Written by {0}"
msgstr ""
-msgid "This article is under the {0} license."
+#, fuzzy
+msgid "This article is published under the {0} license."
msgstr "Эта статья распространяется под лицензией {0}"
msgid "One like"
@@ -94,7 +95,8 @@ msgstr[0] "Одно продвижение"
msgstr[1] "{0} продвижения"
msgstr[2] "{0} продвижений"
-msgid "I don't want to boost this anymore"
+#, fuzzy
+msgid "I don't want this boosted anymore"
msgstr "Я не хочу больше продвигать это"
msgid "Boost"
@@ -121,7 +123,8 @@ msgstr "Опубликовать"
msgid "Login"
msgstr "Войти"
-msgid "Username or email"
+#, fuzzy
+msgid "Username, or email"
msgstr "Имя пользователя или адрес электронной почты"
msgid "Password"
@@ -133,7 +136,8 @@ msgstr "Панель управления"
msgid "Your Dashboard"
msgstr "Ваша панель управления"
-msgid "Your Blogs"
+#, fuzzy
+msgid "Your blogs"
msgstr "Ваши блоги"
#, fuzzy
@@ -148,7 +152,8 @@ msgstr "Начать новый блог"
msgid "Admin"
msgstr "Администратор"
-msgid "It is you"
+#, fuzzy
+msgid "That's you"
msgstr "Это вы"
msgid "Edit your profile"
@@ -231,34 +236,43 @@ msgstr "Войти"
msgid "Register"
msgstr "Зарегистрироваться"
-msgid "You need to be logged in order to create a new blog"
+#, fuzzy
+msgid "You need to be signed in, for you to create a new blog"
msgstr "Вы должны войти чтобы создать новый блог"
-msgid "You need to be logged in order to post a comment"
+#, fuzzy
+msgid "You need to be signed in, so that you can post a comment"
msgstr "Вы должны войти чтобы оставлять комментарии"
-msgid "You need to be logged in order to like a post"
+#, fuzzy
+msgid "You need to be signed in, in order for you to like a post"
msgstr "Вы должны войти чтобы отмечать понравившиеся посты"
msgid "You need to be logged in order to see your notifications"
msgstr "Вы должны войти чтобы просматривать ваши уведомления"
-msgid "You need to be logged in order to write a new post"
+#, fuzzy
+msgid "You need to be logged in, to be able to write a new post"
msgstr "Вы должны войти чтобы написать новый пост"
-msgid "You need to be logged in order to boost a post"
+#, fuzzy
+msgid "You need to be logged in, for you to be able to boost a post"
msgstr "Вы должны войти чтобы продвинуть пост"
-msgid "Invalid username or password"
+#, fuzzy
+msgid "Invalid username, or password"
msgstr "Неправильное имя пользователя или пароль"
-msgid "You need to be logged in order to access your dashboard"
+#, fuzzy
+msgid "You need to be logged in, to be able to access your dashboard"
msgstr "Вы должны войти чтобы получить доступ к вашей панели управления"
-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in, to be able to follow someone"
msgstr "Вы должны войти чтобы подписаться на кого-либо"
-msgid "You need to be logged in order to edit your profile"
+#, fuzzy
+msgid "You need to be logged in, to be able to edit your profile"
msgstr "Вы должны войти чтобы редактировать ваш профиль"
msgid "By {0}"
@@ -273,7 +287,8 @@ msgstr "{0} подписался на вас"
msgid "{0} liked your article"
msgstr "{0} понравилась ваша статья"
-msgid "{0} commented your article"
+#, fuzzy
+msgid "{0} commented on your article"
msgstr "{0} прокомментировал(а) вашу статью"
msgid "We couldn't find this page."
@@ -286,7 +301,8 @@ msgstr "Возможно, что ссылка, по которой вы приш
msgid "You are not authorized."
msgstr "Вы не авторизованы."
-msgid "You are not author in this blog."
+#, fuzzy
+msgid "You are not an author on this blog."
msgstr "Вы не автор этого блога."
msgid "{0} mentioned you."
@@ -310,16 +326,18 @@ msgstr "Ваш комментарий не может быть пустым"
msgid "A post with the same title already exists."
msgstr "Пост с таким же заголовком уже существует."
-msgid "We need an email or a username to identify you"
+#, fuzzy
+msgid "We need an email, or a username to identify you"
msgstr ""
"Нам требуется электронная почта или имя пользователя чтобы идентифицировать "
"вас"
-msgid "Your password can't be empty"
+#, fuzzy
+msgid "Your password field can't be empty"
msgstr "Ваш пароль не может быть пустым"
-msgid "Passwords are not matching"
-msgstr "Пароли не совпадают"
+msgid "The two passwords must be a match!"
+msgstr ""
msgid "Username can't be empty"
msgstr "Имя пользователя не может быть пустым"
@@ -327,16 +345,18 @@ msgstr "Имя пользователя не может быть пустым"
msgid "Invalid email"
msgstr "Неправильный адрес электронной почты"
-msgid "Password should be at least 8 characters long"
+#, fuzzy
+msgid "The password should be at least 8 characters long"
msgstr "Пароль должен быть не короче 8 символов"
-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
-msgstr[0] "Один автор в этом блоге: "
-msgstr[1] "{0} автора в этом блоге: "
-msgstr[2] "{0} авторов в этом блоге: "
+msgid "This blog has one author: "
+msgid_plural "This blog has {0} authors: "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-msgid "Login or use your Fediverse account to interact with this article"
+#, fuzzy
+msgid "Log in, or use your Fediverse account to interact with this article"
msgstr ""
"Войдите или используйте свой Fediverse-аккаунт, чтобы взаимодействовать с "
"этой статьёй"
@@ -344,11 +364,11 @@ msgstr ""
msgid "Optional"
msgstr "Не обязательно"
-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
-msgstr[0] "Один пост в этом блоге"
-msgstr[1] "{0} поста в этом блоге"
-msgstr[2] "{0} постов в этом блоге"
+msgid "This blog has one article"
+msgid_plural "This blog has {0} articles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
msgid "Previous page"
msgstr "Предыдущая страница"
@@ -371,7 +391,8 @@ msgstr "Настройки узла"
msgid "Allow anyone to register"
msgstr "Позволить регистрироваться кому угодно"
-msgid "Short description"
+#, fuzzy
+msgid "Short description - byline"
msgstr "Краткое описание"
msgid "Markdown is supported"
@@ -386,7 +407,8 @@ msgstr "Лицензия по умолчанию"
msgid "Save settings"
msgstr "Сохранить настройки"
-msgid "No comments yet. Be the first to react!"
+#, fuzzy
+msgid "There are no comments here yet. Be the first to react!"
msgstr "Пока что нет комментариев. Станьте первыми!"
msgid "About this instance"
@@ -398,12 +420,15 @@ msgstr "Что такое Plume?"
msgid "Plume is a decentralized blogging engine."
msgstr "Plume это децентрализованный движок для блоггинга."
-msgid "Authors can manage various blogs from an unique website."
+#, fuzzy
+msgid "Authors can manage various blogs, each from a separate, unique website."
msgstr "Авторы могут управлять различными блогами с одного сайта."
+#, fuzzy
msgid ""
-"Articles are also visible on other Plume websites, and you can interact with "
-"them directly from other platforms like Mastodon."
+"Articles are also visible on other Plume websites, called instances, and you "
+"can interact with them directly from other platforms like Mastodon, or "
+"WriteFreely."
msgstr ""
"Статьи также видны на других сайтах Plume и вы можете взаимодействовать с "
"ними напрямую из других платформ, таких как Mastodon."
@@ -420,7 +445,7 @@ msgstr ""
msgid "Who wrote {0} articles"
msgstr ""
-msgid "And connected to {0} other instances"
+msgid "And are connected to {0} other instances"
msgstr ""
msgid "Read the detailed rules"
@@ -453,13 +478,16 @@ msgstr "Детали медиафайла"
msgid "Go back to the gallery"
msgstr "Вернуться в галерею"
-msgid "Markdown code"
+#, fuzzy
+msgid "Markdown syntax"
msgstr "Код Markdown"
-msgid "Copy it in your articles to insert this media."
+#, fuzzy
+msgid "Copy it into your articles, to insert this media."
msgstr "Скопируйте это в ваши статьи чтобы вставить этот медиафайл."
-msgid "Use as avatar"
+#, fuzzy
+msgid "Use as an avatar"
msgstr "Использовать как аватар"
msgid "Delete"
@@ -468,7 +496,8 @@ msgstr "Удалить"
msgid "Upload"
msgstr "Загрузить"
-msgid "You don't have any media yet."
+#, fuzzy
+msgid "You don't have any media uploaded yet."
msgstr "Пока что вы не можете загружать медиафайлы."
msgid "Media upload"
@@ -486,8 +515,10 @@ msgstr "Файл"
msgid "Send"
msgstr "Отправить"
+#, fuzzy
msgid ""
-"Sorry, but registrations are closed on this instance. Try to find another one"
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
msgstr ""
"Извините, но регистрации закрыты на данном узле. Попробуйти найти другой"
@@ -502,8 +533,9 @@ msgstr "Войдите, чтобы отмечать понравившиеся
msgid "Login to boost"
msgstr "Войдите, чтобы продвигать посты"
-msgid "Your feed"
-msgstr "Ваша лента"
+#, fuzzy
+msgid "Personal feed"
+msgstr "Локальная лента"
#, fuzzy
msgid "Federated feed"
@@ -512,14 +544,16 @@ msgstr "Объединенная лента"
msgid "Local feed"
msgstr "Локальная лента"
-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to follow some people."
msgstr ""
"Пока что здесь ничего нет. Попробуйте подписаться на большее число людей."
msgid "Articles"
msgstr "Статьи"
-msgid "All the articles of the Fediverse"
+#, fuzzy
+msgid "All of the articles within the Fediverse"
msgstr "Все статьи из Fediverse"
msgid "Articles from {0}"
@@ -528,7 +562,8 @@ msgstr "Статьи с {0}"
msgid "View all"
msgstr "Показать все"
-msgid "Articles tagged \"{0}\""
+#, fuzzy
+msgid "Articles tagged under \"{0}\""
msgstr "Статьи, отмеченные тегом «{0}»"
msgid "Edit"
@@ -574,10 +609,11 @@ msgid "Ban"
msgstr "Запретить"
#, fuzzy
-msgid "Useful for visually impaired people and licensing"
+msgid "Useful for visually impaired people and information about licenses"
msgstr "Описание для лиц с нарушениями зрения и информация о лицензии"
-msgid "Let it empty if there is none"
+#, fuzzy
+msgid "Leave it empty, if none is meeded"
msgstr "Оставьте пустым если нет"
msgid "Draft"
@@ -586,7 +622,8 @@ msgstr "Черновик"
msgid "This is a draft, don't publish it yet."
msgstr "Это черновик, не публиковать пока что."
-msgid "Update or publish"
+#, fuzzy
+msgid "Update, or publish"
msgstr "Обновить или опубликовать"
msgid "Your Drafts"
@@ -595,14 +632,16 @@ msgstr "Ваши черновики"
msgid "Danger zone"
msgstr "Опасная зона"
-msgid "Be very careful, any action taken here can't be cancelled."
+#, fuzzy
+msgid "Be very careful, any action taken here cannot be reversed."
msgstr ""
"Будьте осторожны, любое действие произведённое здесь не может быть отменено."
msgid "Delete your account"
msgstr "Удалить ваш аккаунт"
-msgid "Sorry, but as an admin, you can't leave your instance."
+#, fuzzy
+msgid "Sorry, but as an admin, you can't leave your own instance."
msgstr "Извините, но как администратор, вы не можете покинуть этот узел."
msgid "Users"
@@ -611,7 +650,8 @@ msgstr "Пользователи"
msgid "This post isn't published yet."
msgstr "Этот пост ещё не опубликован."
-msgid "There is currently no article with that tag"
+#, fuzzy
+msgid "There are currently no articles with such a tag"
msgstr "Сейчас нет статей с таким тегом"
msgid "Illustration"
@@ -621,12 +661,30 @@ msgid "None"
msgstr "Нет"
#, fuzzy
-msgid "Let it empty reserve all rights"
+msgid "Leave empty to reserve all rights"
msgstr "Оставьте пустым если нет"
msgid "All rights reserved."
msgstr ""
+#~ msgid "Passwords are not matching"
+#~ msgstr "Пароли не совпадают"
+
+#~ msgid "One author in this blog: "
+#~ msgid_plural "{0} authors in this blog: "
+#~ msgstr[0] "Один автор в этом блоге: "
+#~ msgstr[1] "{0} автора в этом блоге: "
+#~ msgstr[2] "{0} авторов в этом блоге: "
+
+#~ msgid "One article in this blog"
+#~ msgid_plural "{0} articles in this blog"
+#~ msgstr[0] "Один пост в этом блоге"
+#~ msgstr[1] "{0} поста в этом блоге"
+#~ msgstr[2] "{0} постов в этом блоге"
+
+#~ msgid "Your feed"
+#~ msgstr "Ваша лента"
+
#~ msgid "Home to"
#~ msgstr "Дом для"
diff --git a/static/js/autoExpand.js b/static/js/autoExpand.js
deleted file mode 100644
index e9b42b5e..00000000
--- a/static/js/autoExpand.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const articleContent = document.querySelector('#plume-editor')
-const offset = articleContent.offsetHeight - articleContent.clientHeight
-
-articleContent.addEventListener('keydown', () => {
- articleContent.style.height = 'auto'
- articleContent.style.height = `${articleContent.scrollHeight - offset}px`
-})
diff --git a/static/js/menu.js b/static/js/menu.js
deleted file mode 100644
index 2dee2f39..00000000
--- a/static/js/menu.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// It should normally be working fine even without this code
-// But :focus-within is not yet supported by Webkit/Blink
-
-const button = document.getElementById('menu')
-const menu = document.getElementById('content')
-
-button.addEventListener('click', () => {
- menu.classList.add('show')
-})
-
-menu.addEventListener('click', () => {
- menu.classList.remove('show')
-})
diff --git a/static/js/search.js b/static/js/search.js
deleted file mode 100644
index 3aae870e..00000000
--- a/static/js/search.js
+++ /dev/null
@@ -1,13 +0,0 @@
-window.onload = function(evt) {
- var form = document.getElementById('form');
- form.addEventListener('submit', function () {
- for (var input of form.getElementsByTagName('input')) {
- if (input.name === '') {
- input.name = input.id
- }
- if (input.name && !input.value) {
- input.name = '';
- }
- }
- });
-}
diff --git a/templates/base.rs.html b/templates/base.rs.html
index 9d1815fb..046fbe2c 100644
--- a/templates/base.rs.html
+++ b/templates/base.rs.html
@@ -71,6 +71,6 @@
@i18n!(ctx.1, "Administration")
}
-
+