From 8271f8a6ae3e3a339e8ccbec36c8298fb5be2812 Mon Sep 17 00:00:00 2001 From: Weblate admin Date: Mon, 9 Mar 2020 17:49:22 +0000 Subject: [PATCH 1/9] Translated using Weblate (German) Currently translated at 98.2% (230 of 234 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/de/ --- ui/translations/de.json | 50 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/ui/translations/de.json b/ui/translations/de.json index 15c437012..46719c186 100644 --- a/ui/translations/de.json +++ b/ui/translations/de.json @@ -4,13 +4,15 @@ "no_posts": "Keine Beiträge.", "create_a_post": "Einen Beitrag anlegen", "create_post": "Beitrag anlegen", - "number_of_posts": "{{count}} Beiträge", + "number_of_posts": "{{count}} Beitrag", + "number_of_posts_plural": "{{count}} Beiträge", "posts": "Beiträge", "related_posts": "Diese Beiträge könnten verwandt sein", "cross_posts": "Dieser Link wurde auch veröffentlicht unter:", "cross_post": "Crosspost", "comments": "Kommentare", - "number_of_comments": "{{count}} Kommentare", + "number_of_comments": "{{count}} Kommentar", + "number_of_comments_plural": "{{count}} Kommentare", "remove_comment": "Kommentar löschen", "communities": "Communities", "users": "Benutzer", @@ -20,7 +22,8 @@ "subscribed_to_communities": "Abonnierte <1>communities", "trending_communities": "Trending <1>communities", "list_of_communities": "Liste von communities", - "number_of_communities": "{{count}} Communities", + "number_of_communities": "{{count}} Community", + "number_of_communities_plural": "{{count}} Communities", "community_reqs": "Kleinbuchstaben, Großbuchstaben und keine Leerzeichen.", "edit": "editieren", "reply": "antworten", @@ -56,8 +59,7 @@ "delete": "löschen", "deleted": "gelöscht", "delete_account": "Konto löschen", - "delete_account_confirm": - "Achtung: Dadurch werden alle Ihre Daten dauerhaft gelöscht. Geben Sie zur Bestätigung Ihr Passwort ein.", + "delete_account_confirm": "Achtung: Dadurch werden alle Ihre Daten dauerhaft gelöscht. Geben Sie zur Bestätigung Ihr Passwort ein.", "restore": "wiederherstellen", "ban": "bannen", "ban_from_site": "Von der Seite bannen", @@ -71,9 +73,13 @@ "username": "Benutzername", "email_or_username": "E-mail oder Username", "number_of_users": "{{count}} Benutzer", - "number_of_subscribers": "{{count}} Abonnenten", - "number_of_points": "{{count}} Punkte", + "number_of_users_plural": "{{count}} Benutzer", + "number_of_subscribers": "{{count}} Abonnent", + "number_of_subscribers_plural": "{{count}} Abonnenten", + "number_of_points": "{{count}} Punkt", + "number_of_points_plural": "{{count}} Punkte", "number_online": "{{count}} Benutzer online", + "number_online_plural": "{{count}} Benutzer online", "name": "Name", "title": "Titel", "category": "Kategorie", @@ -109,14 +115,12 @@ "view": "Ansicht", "logout": "Ausloggen", "login_sign_up": "Einloggen / Registrieren", - "notifications_error": - "Desktop-Benachrichtigungen sind in deinem browser nicht verfügbar. Versuche Firefox oder Chrome.", + "notifications_error": "Desktop-Benachrichtigungen sind in deinem browser nicht verfügbar. Versuche Firefox oder Chrome.", "unread_messages": "Ungelesene Nachrichten", "password": "Passwort", "verify_password": "Passwort überprüfen", "forgot_password": "Passwort vergessen", - "reset_password_mail_sent": - "Eine E-Mail wurde geschickt, um dein Passwort zurückzusetzen.", + "reset_password_mail_sent": "Eine E-Mail wurde geschickt, um dein Passwort zurückzusetzen.", "password_change": "Passwort geändert", "new_password": "neues Passwort", "no_email_setup": "Dieser Server hat E-Mails nicht korrekt eingerichtet.", @@ -146,12 +150,10 @@ "theme": "Aussehen", "sponsors": "Sponsoren", "sponsors_of_lemmy": "Sponsoren von Lemmy", - "sponsor_message": - "Lemmy ist freie <1>Open-Source Software, also ohne Werbung, Monetarisierung oder Venturekapital, Punkt. Deine Spenden gehen direkt an die Vollzeit Entwicklung des Projekts. Vielen Dank an die folgenden Personen:", + "sponsor_message": "Lemmy ist freie <1>Open-Source Software, also ohne Werbung, Monetarisierung oder Venturekapital, Punkt. Deine Spenden gehen direkt an die Vollzeit Entwicklung des Projekts. Vielen Dank an die folgenden Personen:", "support_on_patreon": "Auf Patreon unterstützen", "support_on_liberapay": "Auf Liberapay unterstützen", - "general_sponsors": - "Allgemeine Sponsoren sind die, die zwischen $10 und $39 zu Lemmy beitragen.", + "general_sponsors": "Allgemeine Sponsoren sind die, die zwischen $10 und $39 zu Lemmy beitragen.", "crypto": "Kryptowährung", "bitcoin": "Bitcoin", "ethereum": "Ethereum", @@ -166,8 +168,7 @@ "yes": "Ja", "no": "Nein", "powered_by": "Bereitgestellt durch", - "landing_0": - "Lemmy ist ein <1>Link-Aggregator / Reddit Alternative im <2>Fediverse.<3>Es ist selbst-hostbar, hat live-updates von Kommentar-threads und ist winzig (<4>~80kB). Federation in das ActivityPub Netzwerk ist geplant. <5>Dies ist eine <6>sehr frühe Beta Version, und viele Features funktionieren zurzeit nicht richtig oder fehlen. <7>Schlage neue Features vor oder melde Bugs <8>hier.<9>Gebaut mit <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", + "landing_0": "Lemmy ist ein <1>Link-Aggregator / Reddit Alternative im <2>Fediverse.<3>Es ist selbst-hostbar, hat live-updates von Kommentar-threads und ist winzig (<4>~80kB). Federation in das ActivityPub Netzwerk ist geplant. <5>Dies ist eine <6>sehr frühe Beta Version, und viele Features funktionieren zurzeit nicht richtig oder fehlen. <7>Schlage neue Features vor oder melde Bugs <8>hier.<9>Gebaut mit <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", "not_logged_in": "Nicht eingeloggt.", "community_ban": "Du wurdest von dieser Gemeinschaft gebannt.", "site_ban": "Du wurdest von dieser Seite gebannt", @@ -181,10 +182,8 @@ "couldnt_find_community": "Konnte Gemeinschaft nicht finden.", "couldnt_update_community": "Konnte Gemeinschaft nicht aktualisieren.", "community_already_exists": "Gemeinschaft existiert bereits.", - "community_moderator_already_exists": - "Gemeinschaft Moderator existiert bereits.", - "community_follower_already_exists": - "Gemeinschaft Follower existiert bereits.", + "community_moderator_already_exists": "Gemeinschaft Moderator existiert bereits.", + "community_follower_already_exists": "Gemeinschaft Follower existiert bereits.", "community_user_already_banned": "Gemeinschaft Nutzer schon gebannt.", "couldnt_create_post": "Konnte Beitrag nicht anlegen.", "couldnt_like_post": "Konnte Beitrag nicht liken.", @@ -196,15 +195,13 @@ "not_an_admin": "Kein Administrator.", "site_already_exists": "Seite existiert bereits.", "couldnt_update_site": "Konnte Seite nicht aktualisieren.", - "couldnt_find_that_username_or_email": - "Konnte Username oder E-Mail nicht finden.", + "couldnt_find_that_username_or_email": "Konnte Username oder E-Mail nicht finden.", "password_incorrect": "Passwort falsch.", "passwords_dont_match": "Passwörter stimmen nicht überein.", "admin_already_created": "Entschuldigung, es gibt schon einen Administrator.", "user_already_exists": "Nutzer existiert bereits.", "couldnt_update_user": "Konnte Nutzer nicht aktualisieren", - "system_err_login": - "Systemfehler. Versuche dich aus- und wieder einzuloggen.", + "system_err_login": "Systemfehler. Versuche dich aus- und wieder einzuloggen.", "cross_posted_to": "Crossposted auf: ", "create_private_message": "Privatnachricht erstellen", "send_secure_message": "Sichere Nachricht absenden", @@ -237,5 +234,6 @@ "no_private_message_edit_allowed": "Editieren der Privatnachricht nicht erlaubt.", "couldnt_update_private_message": "Konnte Privatnachricht nicht aktualisieren.", "time": "Zeit", - "action": "Aktion" + "action": "Aktion", + "more": "mehr" } From 95ed04906b4f457cd9eaad24a7cb3dc9154dbbd5 Mon Sep 17 00:00:00 2001 From: olivia maia Date: Mon, 9 Mar 2020 17:49:23 +0000 Subject: [PATCH 2/9] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (234 of 234 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/pt_BR/ --- ui/translations/pt_BR.json | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/ui/translations/pt_BR.json b/ui/translations/pt_BR.json index 7060a09a8..31725270c 100644 --- a/ui/translations/pt_BR.json +++ b/ui/translations/pt_BR.json @@ -4,14 +4,16 @@ "no_posts": "Sem publicações.", "create_a_post": "Criar uma publicação", "create_post": "Criar publicação", - "number_of_posts": "{{count}} publicações", + "number_of_posts": "{{count}} publicação", + "number_of_posts_plural": "{{count}} publicações", "posts": "Publicações", "related_posts": "Essas publicações podem estar relacionadas", "cross_posts": "Esse link também foi publicado em:", "cross_post": "re-publicar", "cross_posted_to": "Publicado também em: ", "comments": "Comentários", - "number_of_comments": "{{count}} comentários", + "number_of_comments": "{{count}} comentário", + "number_of_comments_plural": "{{count}} comentários", "remove_comment": "Apagar comentário", "communities": "Comunidades", "users": "Usuários", @@ -21,7 +23,8 @@ "subscribed_to_communities": "Inscrito em <1>comunidades", "trending_communities": "<1>Comunidades em tendência", "list_of_communities": "Lista de comunidades", - "number_of_communities": "{{count}} comunidades", + "number_of_communities": "{{count}} comunidade", + "number_of_communities_plural": "{{count}} comunidades", "community_reqs": "minúsculas, sublinhados e sem espaços.", "create_private_message": "Criar mensagem privada", "send_secure_message": "Enviar mensagem segura", @@ -77,10 +80,14 @@ "creator": "criador", "username": "nome de usuário", "email_or_username": "E-mail ou nome de usuário", - "number_of_users": "{{count}} usuários", - "number_of_subscribers": "{{count}} inscritos", - "number_of_points": "{{count}} pontos", - "number_online": "{{count}} usuários online", + "number_of_users": "{{count}} usuário", + "number_of_users_plural": "{{count}} usuários", + "number_of_subscribers": "{{count}} inscrito", + "number_of_subscribers_plural": "{{count}} inscritos", + "number_of_points": "{{count}} ponto", + "number_of_points_plural": "{{count}} pontos", + "number_online": "{{count}} usuário online", + "number_online_plural": "{{count}} usuários online", "name": "Nome", "title": "Título", "category": "Categoria", @@ -228,5 +235,9 @@ "action": "Ação", "more": "mais", "couldnt_get_comments": "Não foi possível obter os comentários.", - "post_title_too_long": "Título da publicação muito longo." + "post_title_too_long": "Título da publicação muito longo.", + "upvote": "Voto positivo", + "downvote": "Voto negativo", + "block_leaving": "Tem certeza que quer sair?", + "sorting_help": "ajuda sobre ordenação" } From ed57418e914e87231c3be0bf8f932b9cb08d9f82 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 9 Mar 2020 23:16:19 -0400 Subject: [PATCH 3/9] Version v0.6.34 --- ansible/VERSION | 2 +- docker/dev/docker_update.sh | 1 + docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index 0f00d2481..aac7caa5e 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.33 +v0.6.34 diff --git a/docker/dev/docker_update.sh b/docker/dev/docker_update.sh index 9d0f45429..a162eb889 100755 --- a/docker/dev/docker_update.sh +++ b/docker/dev/docker_update.sh @@ -1,2 +1,3 @@ #!/bin/sh +sudo chmod -R 777 volumes docker-compose up -d --no-deps --build diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index bfe4bb8ee..961283c2c 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.33 + image: dessalines/lemmy:v0.6.34 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index 068044206..0a545edbf 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.33"; +pub const VERSION: &str = "v0.6.34"; diff --git a/ui/src/version.ts b/ui/src/version.ts index f3800c0b3..6379e496e 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.33'; +export const version: string = 'v0.6.34'; From 3c578d8420b9e6e9cda4bd4b4708a4e07b9c7c10 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 9 Mar 2020 23:20:13 -0400 Subject: [PATCH 4/9] Version v0.6.35 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index aac7caa5e..a9cee1de7 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.34 +v0.6.35 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 961283c2c..0adf27ee4 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.34 + image: dessalines/lemmy:v0.6.35 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index 0a545edbf..8cc144616 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.34"; +pub const VERSION: &str = "v0.6.35"; diff --git a/ui/src/version.ts b/ui/src/version.ts index 6379e496e..671e451d6 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.34'; +export const version: string = 'v0.6.35'; From 73cd75578858808dcf43e69644049715aa11414a Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 9 Mar 2020 23:21:24 -0400 Subject: [PATCH 5/9] Version v0.6.36 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index a9cee1de7..c5c43fd21 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.35 +v0.6.36 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 0adf27ee4..ac9e27a92 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.35 + image: dessalines/lemmy:v0.6.36 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index 8cc144616..8f6723a73 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.35"; +pub const VERSION: &str = "v0.6.36"; diff --git a/ui/src/version.ts b/ui/src/version.ts index 671e451d6..6ded3b6fe 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.35'; +export const version: string = 'v0.6.36'; From 760bf3c77fffeb8c10b02f233e5fdc48fbc6fb17 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 9 Mar 2020 23:22:24 -0400 Subject: [PATCH 6/9] Version v0.6.37 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index c5c43fd21..2ef791205 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.36 +v0.6.37 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index ac9e27a92..17b2b6108 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.36 + image: dessalines/lemmy:v0.6.37 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index 8f6723a73..baf81799d 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.36"; +pub const VERSION: &str = "v0.6.37"; diff --git a/ui/src/version.ts b/ui/src/version.ts index 6ded3b6fe..f33eec6e8 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.36'; +export const version: string = 'v0.6.37'; From d932aaa27ff733421605b35340c8dd763e7c6c08 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 9 Mar 2020 23:24:06 -0400 Subject: [PATCH 7/9] Version v0.6.38 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index 2ef791205..e1d0f4cf4 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.37 +v0.6.38 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 17b2b6108..ce808a80a 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.37 + image: dessalines/lemmy:v0.6.38 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index baf81799d..f04bba1b1 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.37"; +pub const VERSION: &str = "v0.6.38"; diff --git a/ui/src/version.ts b/ui/src/version.ts index f33eec6e8..cce099f21 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.37'; +export const version: string = 'v0.6.38'; From c8e19fa7bff6e902653403f46798f58324c6fd7d Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 9 Mar 2020 23:26:15 -0400 Subject: [PATCH 8/9] Version v0.6.39 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index e1d0f4cf4..f9fc17d61 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.38 +v0.6.39 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index ce808a80a..70c6bfe70 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.38 + image: dessalines/lemmy:v0.6.39 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index f04bba1b1..b7bdab094 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.38"; +pub const VERSION: &str = "v0.6.39"; diff --git a/ui/src/version.ts b/ui/src/version.ts index cce099f21..b6ddc840f 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.38'; +export const version: string = 'v0.6.39'; From e5426f8f00beb67c9f247b7991f378d39991200d Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 9 Mar 2020 23:37:39 -0400 Subject: [PATCH 9/9] Adding volumes to dockerignore. --- .dockerignore | 1 + docker/dev/docker_update.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 73c475542..4288d3cb5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,5 @@ ui/node_modules ui/dist server/target +docker/dev/volumes .git diff --git a/docker/dev/docker_update.sh b/docker/dev/docker_update.sh index a162eb889..9d0f45429 100755 --- a/docker/dev/docker_update.sh +++ b/docker/dev/docker_update.sh @@ -1,3 +1,2 @@ #!/bin/sh -sudo chmod -R 777 volumes docker-compose up -d --no-deps --build