From 001eb990912e5b1f61cc4895bdc81ba4501cd526 Mon Sep 17 00:00:00 2001 From: Dominik Pataky Date: Sun, 19 Aug 2018 00:52:28 +0200 Subject: [PATCH] Rename 'reshare' to 'boost' in templates and PO For now it might be enough to only reword 'reshare' to 'boost' in the frontend. The code can continue to use 'reshare'. Includes the most recent German translation. Fixes #74 --- po/de.po | 56 ++++++++++++++++--------- po/en.po | 16 +++---- po/fr.po | 50 +++++++++++++++------- po/gl.po | 16 +++---- po/nb.po | 50 +++++++++++++++------- po/pl.po | 53 ++++++++++++++++------- po/plume.pot | 16 +++---- templates/notifications/index.html.tera | 2 +- templates/posts/details.html.tera | 6 +-- templates/users/details.html.tera | 4 +- 10 files changed, 176 insertions(+), 93 deletions(-) diff --git a/po/de.po b/po/de.po index 9b4b2ec..e6a2030 100644 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: plume\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-15 16:33-0700\n" -"PO-Revision-Date: 2018-08-01 13:50+0200\n" +"PO-Revision-Date: 2018-08-19 00:49+0200\n" "Last-Translator: cookie \n" "Language-Team: none\n" "Language: de\n" @@ -11,7 +11,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.9\n" +"X-Generator: Poedit 2.1.1\n" msgid "Latest articles" msgstr "Neueste Artikel" @@ -89,16 +89,16 @@ msgstr "Nicht mehr Liken" msgid "Add yours" msgstr "Like" -msgid "One reshare" -msgid_plural "{{ count }} reshares" -msgstr[0] "Ein Reshare" -msgstr[1] "{{ count }} Reshares" +msgid "One Boost" +msgid_plural "{{ count }} Boosts" +msgstr[0] "Ein Boost" +msgstr[1] "{{ count }} Boosts" -msgid "I don't want to reshare this anymore" -msgstr "Nicht mehr Resharen" +msgid "I don't want to boost this anymore" +msgstr "Nicht mehr boosten" -msgid "Reshare" -msgstr "Resharen" +msgid "Boost" +msgstr "Boost" msgid "Comments" msgstr "Kommentare" @@ -162,8 +162,8 @@ msgstr "Folgen" msgid "Unfollow" msgstr "Entfolgen" -msgid "Recently reshared" -msgstr "Vor Kurzem Reshared" +msgid "Recently boosted" +msgstr "Kürzlich geboostet" msgid "One follower" msgid_plural "{{ count }} followers" @@ -242,8 +242,8 @@ msgstr "Du musst eingeloggt sein, um deine Benachrichtigungen zu sehen" msgid "You need to be logged in order 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 reshare a post" -msgstr "Du musst eingeloggt sein, um einen Beitrag zu resharen" +msgid "You need to be logged in order to boost a post" +msgstr "Du musst eingeloggt sein, um einen Beitrag zu boosten" msgid "Invalid username or password" msgstr "Nutzername oder Passwort ungültig" @@ -261,8 +261,8 @@ msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" msgstr "" "Von {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" -msgid "{{ data }} reshared your article" -msgstr "{{ data }} hat deinen Artikel reshared" +msgid "{{ data }} boosted your article" +msgstr "{{ data }} hat deinen Artikel geboostet" msgid "{{ data }} started following you" msgstr "{{ data }} folgt dir nun" @@ -310,9 +310,8 @@ msgid "We need an email or a username to identify you" msgstr "" "Wir brauchen eine E-Mail oder einen Nutzernamen um dich zu identifizieren" -#, fuzzy msgid "Your password can't be empty" -msgstr "Dein Kommentar kann nicht leer sein" +msgstr "Dein Passwort kann nicht leer sein" msgid "Passwords are not matching" msgstr "Passwörter stimmen nicht überein" @@ -362,8 +361,8 @@ msgstr "{{ user }} folgt dir nun." msgid "{{ user }} liked your article." msgstr "{{ user }} hat deinen Artikel geliked." -msgid "{{ user }} reshared your article." -msgstr "{{ user }} hat deinen Artikel reshared." +msgid "{{ user }} boosted your article." +msgstr "{{ user }} hat deinen Artikel geboostet." msgid "Source code" msgstr "Quellcode" @@ -438,5 +437,22 @@ msgstr "Artikel geschrieben haben" msgid "Read the detailed rules" msgstr "Lies die detailierten Regeln" +#~ msgid "One reshare" +#~ msgid_plural "{{ count }} reshares" +#~ msgstr[0] "Ein Reshare" +#~ msgstr[1] "{{ count }} Reshares" + +#~ msgid "Reshare" +#~ msgstr "Resharen" + +#~ msgid "You need to be logged in order to reshare a post" +#~ msgstr "Du musst eingeloggt sein, um einen Beitrag zu resharen" + +#~ msgid "{{ data }} reshared your article" +#~ msgstr "{{ data }} hat deinen Artikel reshared" + +#~ msgid "{{ user }} reshared your article." +#~ msgstr "{{ user }} hat deinen Artikel reshared." + #~ msgid "Your password should be at least 8 characters long" #~ msgstr "Das Passwort sollte mindestens 8 Zeichen lang sein" diff --git a/po/en.po b/po/en.po index d365eb0..e6bbfd8 100644 --- a/po/en.po +++ b/po/en.po @@ -86,15 +86,15 @@ msgstr "" msgid "Add yours" msgstr "" -msgid "One reshare" -msgid_plural "{{ count }} reshares" +msgid "One Boost" +msgid_plural "{{ count }} Boosts" msgstr[0] "" msgstr[1] "" -msgid "I don't want to reshare this anymore" +msgid "I don't want to boost this anymore" msgstr "" -msgid "Reshare" +msgid "Boost" msgstr "" msgid "Comments" @@ -159,7 +159,7 @@ msgstr "" msgid "Unfollow" msgstr "One follower" -msgid "Recently reshared" +msgid "Recently boosted" msgstr "" msgid "One follower" @@ -241,7 +241,7 @@ msgstr "" msgid "You need to be logged in order to write a new post" msgstr "" -msgid "You need to be logged in order to reshare a post" +msgid "You need to be logged in order to boost a post" msgstr "" msgid "Invalid username or password" @@ -259,7 +259,7 @@ msgstr "" msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" msgstr "" -msgid "{{ data }} reshared your article" +msgid "{{ data }} boosted your article" msgstr "" msgid "{{ data }} started following you" @@ -356,7 +356,7 @@ msgstr "" msgid "{{ user }} liked your article." msgstr "" -msgid "{{ user }} reshared your article." +msgid "{{ user }} boosted your article." msgstr "" msgid "Source code" diff --git a/po/fr.po b/po/fr.po index 8ce372d..687034d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -87,16 +87,17 @@ msgstr "Je n'aime plus" msgid "Add yours" msgstr "J'aime" -msgid "One reshare" -msgid_plural "{{ count }} reshares" -msgstr[0] "{{ count }} repartage" -msgstr[1] "{{ count }} repartages" +msgid "One Boost" +msgid_plural "{{ count }} Boosts" +msgstr[0] "" +msgstr[1] "" -msgid "I don't want to reshare this anymore" +#, fuzzy +msgid "I don't want to boost this anymore" msgstr "Je ne veux plus repartager" -msgid "Reshare" -msgstr "Repartagez" +msgid "Boost" +msgstr "" msgid "Comments" msgstr "Commentaires" @@ -160,7 +161,8 @@ msgstr "S'abonner" msgid "Unfollow" msgstr "Se désabonner" -msgid "Recently reshared" +#, fuzzy +msgid "Recently boosted" msgstr "Récemment repartagé" msgid "One follower" @@ -240,8 +242,9 @@ msgstr "Vous devez vous connecter pour voir vos notifications" msgid "You need to be logged in order to write a new post" msgstr "Vous devez vous connecter pour écrire un article" -msgid "You need to be logged in order to reshare a post" -msgstr "Vous devez vous connecter pour repartager un article" +#, fuzzy +msgid "You need to be logged in order to boost a post" +msgstr "Vous devez vous connecter pour aimer un article" msgid "Invalid username or password" msgstr "Nom d'utilisateur ou mot de passe invalide" @@ -258,8 +261,9 @@ msgstr "Vous devez vous connecter pour modifier votre profil" msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" msgstr "De {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" -msgid "{{ data }} reshared your article" -msgstr "{{ data }} a repartagé votre article" +#, fuzzy +msgid "{{ data }} boosted your article" +msgstr "{{ data }} a commenté votre article" msgid "{{ data }} started following you" msgstr "{{ data }} vous suit" @@ -361,8 +365,9 @@ msgstr "{{ user }} vous suit" msgid "{{ user }} liked your article." msgstr "{{ user }} a aimé votre article" -msgid "{{ user }} reshared your article." -msgstr "{{ user }} a repartagé votre article" +#, fuzzy +msgid "{{ user }} boosted your article." +msgstr "{{ user }} a commenté votre article" msgid "Source code" msgstr "Code source" @@ -438,5 +443,22 @@ msgstr "articles" msgid "Read the detailed rules" msgstr "Lisez le détail des règles" +#~ msgid "One reshare" +#~ msgid_plural "{{ count }} reshares" +#~ msgstr[0] "{{ count }} repartage" +#~ msgstr[1] "{{ count }} repartages" + +#~ msgid "Reshare" +#~ msgstr "Repartagez" + +#~ msgid "You need to be logged in order to reshare a post" +#~ msgstr "Vous devez vous connecter pour repartager un article" + +#~ msgid "{{ data }} reshared your article" +#~ msgstr "{{ data }} a repartagé votre article" + +#~ msgid "{{ user }} reshared your article." +#~ msgstr "{{ user }} a repartagé votre article" + #~ msgid "Your password should be at least 8 characters long" #~ msgstr "Votre mot de passe doit faire au moins 8 caractères." diff --git a/po/gl.po b/po/gl.po index d5a558d..831aab9 100644 --- a/po/gl.po +++ b/po/gl.po @@ -84,15 +84,15 @@ msgstr "" msgid "Add yours" msgstr "" -msgid "One reshare" -msgid_plural "{{ count }} reshares" +msgid "One Boost" +msgid_plural "{{ count }} Boosts" msgstr[0] "" msgstr[1] "" -msgid "I don't want to reshare this anymore" +msgid "I don't want to boost this anymore" msgstr "" -msgid "Reshare" +msgid "Boost" msgstr "" msgid "Comments" @@ -155,7 +155,7 @@ msgstr "" msgid "Unfollow" msgstr "" -msgid "Recently reshared" +msgid "Recently boosted" msgstr "" msgid "One follower" @@ -235,7 +235,7 @@ msgstr "" msgid "You need to be logged in order to write a new post" msgstr "" -msgid "You need to be logged in order to reshare a post" +msgid "You need to be logged in order to boost a post" msgstr "" msgid "Invalid username or password" @@ -253,7 +253,7 @@ msgstr "" msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" msgstr "" -msgid "{{ data }} reshared your article" +msgid "{{ data }} boosted your article" msgstr "" msgid "{{ data }} started following you" @@ -350,7 +350,7 @@ msgstr "" msgid "{{ user }} liked your article." msgstr "" -msgid "{{ user }} reshared your article." +msgid "{{ user }} boosted your article." msgstr "" msgid "Source code" diff --git a/po/nb.po b/po/nb.po index c7d7b1c..0506fc0 100644 --- a/po/nb.po +++ b/po/nb.po @@ -87,16 +87,17 @@ msgstr "Jeg liker ikke dette lengre" msgid "Add yours" msgstr "Legg til din" -msgid "One reshare" -msgid_plural "{{ count }} reshares" -msgstr[0] "Én deling" -msgstr[1] "{{ count }} delinger" +msgid "One Boost" +msgid_plural "{{ count }} Boosts" +msgstr[0] "" +msgstr[1] "" -msgid "I don't want to reshare this anymore" +#, fuzzy +msgid "I don't want to boost this anymore" msgstr "Jeg ønsker ikke å dele dette lengre" -msgid "Reshare" -msgstr "Del" +msgid "Boost" +msgstr "" msgid "Comments" msgstr "Kommetarer" @@ -160,7 +161,8 @@ msgstr "Følg" msgid "Unfollow" msgstr "Slutt å følge" -msgid "Recently reshared" +#, fuzzy +msgid "Recently boosted" msgstr "Nylig delt" msgid "One follower" @@ -240,8 +242,9 @@ msgstr "Du må være logget inn for å se meldingene dine" msgid "You need to be logged in order to write a new post" msgstr "Du må være logget inn for å skrive et nytt innlegg" -msgid "You need to be logged in order to reshare a post" -msgstr "Du må være logget inn for å dele et innlegg" +#, fuzzy +msgid "You need to be logged in order to boost a post" +msgstr "Du må være logget inn for å like et innlegg" msgid "Invalid username or password" msgstr "Ugyldig brukernavn eller passord" @@ -258,8 +261,9 @@ msgstr "Du må være logget inn for å redigere profilen din" msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" msgstr "Av {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" -msgid "{{ data }} reshared your article" -msgstr "{{ data }} delte din artikkel" +#, fuzzy +msgid "{{ data }} boosted your article" +msgstr "{{ data }} la inn en kommentar til artikkelen din" msgid "{{ data }} started following you" msgstr "{{ data }} har begynt å følge deg" @@ -357,8 +361,9 @@ msgstr "{{ user }} har nå begynt å følge deg." msgid "{{ user }} liked your article." msgstr "{{ user }} likte artikkelen din." -msgid "{{ user }} reshared your article." -msgstr "{{ user }} delte artikkelen din med sine følgere." +#, fuzzy +msgid "{{ user }} boosted your article." +msgstr "{{ user }} la igjen en kommentar til artikkelen din." msgid "Source code" msgstr "Kildekode" @@ -433,5 +438,22 @@ msgstr "artikler" msgid "Read the detailed rules" msgstr "Les reglene" +#~ msgid "One reshare" +#~ msgid_plural "{{ count }} reshares" +#~ msgstr[0] "Én deling" +#~ msgstr[1] "{{ count }} delinger" + +#~ msgid "Reshare" +#~ msgstr "Del" + +#~ msgid "You need to be logged in order to reshare a post" +#~ msgstr "Du må være logget inn for å dele et innlegg" + +#~ msgid "{{ data }} reshared your article" +#~ msgstr "{{ data }} delte din artikkel" + +#~ msgid "{{ user }} reshared your article." +#~ msgstr "{{ user }} delte artikkelen din med sine følgere." + #~ msgid "Your password should be at least 8 characters long" #~ msgstr "Passordet ditt må bestå av minst åtte tegn" diff --git a/po/pl.po b/po/pl.po index 3d0367f..59298d7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -90,17 +90,18 @@ msgstr "Już tego nie lubię" msgid "Add yours" msgstr "Dodaj swoje" -msgid "One reshare" -msgid_plural "{{ count }} reshares" -msgstr[0] "Jedno udostępnienie" -msgstr[1] "{{ count }} udostępnienia" -msgstr[2] "{{ count }} udostępnień" +msgid "One Boost" +msgid_plural "{{ count }} Boosts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -msgid "I don't want to reshare this anymore" +#, fuzzy +msgid "I don't want to boost this anymore" msgstr "Cofnij udostępnienie" -msgid "Reshare" -msgstr "Udostępnij" +msgid "Boost" +msgstr "" msgid "Comments" msgstr "Komentarze" @@ -164,7 +165,8 @@ msgstr "Obserwuj" msgid "Unfollow" msgstr "Przestań obserwować" -msgid "Recently reshared" +#, fuzzy +msgid "Recently boosted" msgstr "Ostatnio udostępniono" msgid "One follower" @@ -245,8 +247,9 @@ msgstr "Musisz się zalogować, aby zobaczyć swoje powiadomienia" msgid "You need to be logged in order to write a new post" msgstr "Musisz się zalogować, aby utworzyć wpis" -msgid "You need to be logged in order to reshare a post" -msgstr "Musisz się zalogować, aby udostępnić wpis" +#, fuzzy +msgid "You need to be logged in order to boost a post" +msgstr "Musisz się zalogować, aby polubić wpis" msgid "Invalid username or password" msgstr "Nieprawidłowa nazwa użytkownika lub hasło" @@ -265,8 +268,9 @@ msgstr "" "Napisano przez {{ link_1 }}{{ url }}{{ link_2 }}{{ name | escape }}" "{{ link_3 }}" -msgid "{{ data }} reshared your article" -msgstr "{{ data }} udostępnił Twój artykuł" +#, fuzzy +msgid "{{ data }} boosted your article" +msgstr "{{ data }} skomentował Twój artykuł" msgid "{{ data }} started following you" msgstr "{{ data }} zaczął Cię obserwować" @@ -368,8 +372,9 @@ msgstr "{{ user }} zaczął Cię obserwować." msgid "{{ user }} liked your article." msgstr "{{ user }} polubił Twój artykuł." -msgid "{{ user }} reshared your article." -msgstr "{{ user }} udostępnił Twój artykuł." +#, fuzzy +msgid "{{ user }} boosted your article." +msgstr "{{ user }} skomentował Twój artykuł." msgid "Source code" msgstr "Kod źródłowy" @@ -444,6 +449,24 @@ msgstr "artykuły" msgid "Read the detailed rules" msgstr "Przeczytaj szczegółowe zasady" +#~ msgid "One reshare" +#~ msgid_plural "{{ count }} reshares" +#~ msgstr[0] "Jedno udostępnienie" +#~ msgstr[1] "{{ count }} udostępnienia" +#~ msgstr[2] "{{ count }} udostępnień" + +#~ msgid "Reshare" +#~ msgstr "Udostępnij" + +#~ msgid "You need to be logged in order to reshare a post" +#~ msgstr "Musisz się zalogować, aby udostępnić wpis" + +#~ msgid "{{ data }} reshared your article" +#~ msgstr "{{ data }} udostępnił Twój artykuł" + +#~ msgid "{{ user }} reshared your article." +#~ msgstr "{{ user }} udostępnił Twój artykuł." + #~ msgid "Your password should be at least 8 characters long" #~ msgstr "Twoje hasło musi składać się przynajmniej z 8 znaków" diff --git a/po/plume.pot b/po/plume.pot index 51dc694..4697178 100644 --- a/po/plume.pot +++ b/po/plume.pot @@ -83,15 +83,15 @@ msgstr "" msgid "Add yours" msgstr "" -msgid "One reshare" -msgid_plural "{{ count }} reshares" +msgid "One Boost" +msgid_plural "{{ count }} Boosts" msgstr[0] "" msgstr[1] "" -msgid "I don't want to reshare this anymore" +msgid "I don't want to boost this anymore" msgstr "" -msgid "Reshare" +msgid "Boost" msgstr "" msgid "Comments" @@ -154,7 +154,7 @@ msgstr "" msgid "Unfollow" msgstr "" -msgid "Recently reshared" +msgid "Recently boosted" msgstr "" msgid "One follower" @@ -234,7 +234,7 @@ msgstr "" msgid "You need to be logged in order to write a new post" msgstr "" -msgid "You need to be logged in order to reshare a post" +msgid "You need to be logged in order to boost a post" msgstr "" msgid "Invalid username or password" @@ -252,7 +252,7 @@ msgstr "" msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" msgstr "" -msgid "{{ data }} reshared your article" +msgid "{{ data }} boosted your article" msgstr "" msgid "{{ data }} started following you" @@ -349,7 +349,7 @@ msgstr "" msgid "{{ user }} liked your article." msgstr "" -msgid "{{ user }} reshared your article." +msgid "{{ user }} boosted your article." msgstr "" msgid "Source code" diff --git a/templates/notifications/index.html.tera b/templates/notifications/index.html.tera index 2b14ec4..ef0135a 100644 --- a/templates/notifications/index.html.tera +++ b/templates/notifications/index.html.tera @@ -52,7 +52,7 @@

- {{ "{{ user }} reshared your article." | _(user=notification.object.user.name | escape) }} + {{ "{{ user }} boosted your article." | _(user=notification.object.user.name | escape) }}

{{ notification.object.post.post.title }}

diff --git a/templates/posts/details.html.tera b/templates/posts/details.html.tera index c20fa49..1c5cee5 100644 --- a/templates/posts/details.html.tera +++ b/templates/posts/details.html.tera @@ -42,12 +42,12 @@ {% endif %}
-

{{ n_reshares }}

+

{{ n_reshares }}

{% if has_reshared %} - + {% else %} - + {% endif %}
diff --git a/templates/users/details.html.tera b/templates/users/details.html.tera index f129135..89e79cf 100644 --- a/templates/users/details.html.tera +++ b/templates/users/details.html.tera @@ -18,7 +18,7 @@ {{ user.summary | safe }} - {% if recents | length != 0 %} + {% if recents | length != 0 %}

{{ "Latest articles" | _ }}

{% for article in recents %} @@ -28,7 +28,7 @@ {% endif %} {% if reshares | length != 0 %} -

{{ "Recently reshared" | _ }}

+

{{ "Recently boosted" | _ }}

{% for article in reshares %} {{ macros::post_card(article=article) }}