Skip to content

Commit

Permalink
Step 2: Run support/correct_msgid. By this:
Browse files Browse the repository at this point in the history
  - Entries to keep po files of the other languages in sync with modification
    of US English on Step 1 will be added.
  - The messages in source codes will be changed according to the changes on
    US English catalog (If you wanbt to see the changes on source codes in
    advance, run correct_msgid with --dry_run option).

In this demo commit, you can see the changes described in above.

Thus, messages in US English catalog may be changed as catalogs for the other languages may be.
  • Loading branch information
ikedas committed Feb 5, 2021
1 parent a16317c commit 6d5eba5
Show file tree
Hide file tree
Showing 36 changed files with 1,041 additions and 15 deletions.
2 changes: 1 addition & 1 deletion default/mail_tt2/report.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ Warning: this message may already have been sent by one of the list's moderators
[%|loc(report_param.email || report_param.value)%]Address "%1" is incorrect[%END%]

[%~ ELSIF report_entry == 'blacklisted_domain' ~%]
[%|loc(report_param.email || report_param.value)%]Address "%1" belongs to a blacklisted domain[%END%]
[%|loc(report_param.email || report_param.value)%]Address "%1" belongs to a denylisted domain[%END%]

[%~ ELSIF report_entry == 'incorrect_passwd' ~%]
[%|loc%]Provided password is incorrect[%END%]
Expand Down
4 changes: 2 additions & 2 deletions default/web_tt2/admin.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</li>
[% IF conf.use_blacklist != 'none' %]
<li>
<strong><a href="[% 'blacklist' | url_rel([list]) %]" >[%|loc%]Blacklist:[%END%]</a></strong>
[%|loc%]Handles the set of black-listed mail addresses for this list.[%END%]
<strong><a href="[% 'blacklist' | url_rel([list]) %]" >[%|loc%]Denylist:[%END%]</a></strong>
[%|loc%]Handles the set of deny-listed mail addresses for this list.[%END%]
</li>
[% END %]
[% END %]
Expand Down
8 changes: 4 additions & 4 deletions default/web_tt2/blacklist.tt2
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!-- blacklist.tt2 -->
<div class="block">
<h2>[%|loc%]Blacklist management[%END%]</h2><br />
<h2>[%|loc%]Denylist management[%END%]</h2><br />

<div id="blacklist">
[% IF rows == '0' %]
<p class="small-12 medium-8 medium-centered columns alert-box info text-center">[%|loc%]The current blacklist is empty[%END%]</p>
<p class="small-12 medium-8 medium-centered columns alert-box info text-center">[%|loc%]The current denylist is empty[%END%]</p>
[% ELSE %]
<p class="small-12 medium-8 medium-centered columns alert-box info text-center">[%|loc(rows)%]The current blacklist contains %1 line(s)[%END%]</p>
<p class="small-12 medium-8 medium-centered columns alert-box info text-center">[%|loc(rows)%]The current denylist contains %1 line(s)[%END%]</p>
[% END %]

[%|loc(conf.use_blacklist)%]Operation requested by users which email is listed in the blacklist file are rejected. The blacklist is in use for the following operation: %1.[%END%]
[%|loc(conf.use_blacklist)%]Operation requested by users which email is listed in the denylist file are rejected. The denylist is in use for the following operation: %1.[%END%]
<br />
<br />
[%|loc%]Syntax:[%END%]
Expand Down
4 changes: 2 additions & 2 deletions default/web_tt2/modindex.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<input type="checkbox" id="blacklist" name="blacklist"
form="moderate_mails" />
<label for="blacklist">
[%|loc %]Add to blacklist[%END%]
[%|loc %]Add to denylist[%END%]
</label>
[% END ~%]
</p>
Expand All @@ -155,7 +155,7 @@
<fieldset>
<input type="hidden" name="list" value="[% list %]" />
[% IF conf.use_blacklist != 'none' %]
<input class="MainMenuLinks" type="submit" name="action_blacklist" value="[%|loc%]edit blacklist[%END%]" />
<input class="MainMenuLinks" type="submit" name="action_blacklist" value="[%|loc%]edit denylist[%END%]" />
[% END %]
<input class="MainMenuLinks" type="submit" name="action_manage_template" value="[%|loc%]Manage rejection messages[%END%]" />
</fieldset>
Expand Down
2 changes: 1 addition & 1 deletion default/web_tt2/nav.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
[% END %]
<li class="[% class %]">
<a href="[% 'blacklist' | url_rel([list]) %]" >
[%|loc%]Blacklist[%END%]
[%|loc%]Denylist[%END%]
</a>
</li>
[% END %]
Expand Down
2 changes: 1 addition & 1 deletion default/web_tt2/review.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</a>
[% IF conf.use_blacklist != 'none' %]
<a class="actionMenuLinks" href="[% 'blacklist' | url_rel([list]) %]">
[%|loc%]Blacklist[%END%]
[%|loc%]Denylist[%END%]
</a>
[% END %]
<a class="actionMenuLinks" href="[% 'reviewbouncing' | url_rel([list]) %]">
Expand Down
2 changes: 1 addition & 1 deletion default/web_tt2/show_exclude.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h2>[%|loc%]Exclusion table[%END%]</h2>

<p>
[%|loc%]Users listed below are excluded from the list. Beware, that this feature is different from the blacklist. Exclusion makes sense when a list is based on external data sources ; thanks to exclusion, a user can unsubscribe (or being removed by list owner) even though they should be included via an external data source. Users get into the exclusion table, through the standard unsubscribe/delete functions. They get off the exclusion table with the standard subscribe/add functions.[%END%]
[%|loc%]Users listed below are excluded from the list. Beware, that this feature is different from the denylist. Exclusion makes sense when a list is based on external data sources ; thanks to exclusion, a user can unsubscribe (or being removed by list owner) even though they should be included via an external data source. Users get into the exclusion table, through the standard unsubscribe/delete functions. They get off the exclusion table with the standard subscribe/add functions.[%END%]
</p>

[% IF exclude_users ~%]
Expand Down
2 changes: 1 addition & 1 deletion default/web_tt2/viewmod.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</p>
[%~ END %]
<p>
<input type=checkbox name="blacklist" />[%|loc%]Add to blacklist[%END%]
<input type=checkbox name="blacklist" />[%|loc%]Add to denylist[%END%]
</p>
[% IF is_owner && ! msg.value.is_subscriber ~%]
<p>
Expand Down
12 changes: 12 additions & 0 deletions po/sympa/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -5589,10 +5589,18 @@ msgstr "معلومات خاصة "
msgid "Blacklist management"
msgstr "إدارة القائمة السوداء"

#: default/web_tt2/blacklist.tt2:3
msgid "Denylist management"
msgstr "إدارة القائمة السوداء"

#: default/web_tt2/blacklist.tt2:7
msgid "The current blacklist is empty"
msgstr "القائمة السوداء الحالية فارغه"

#: default/web_tt2/blacklist.tt2:7
msgid "The current denylist is empty"
msgstr "القائمة السوداء الحالية فارغه"

#. (rows)
#: default/web_tt2/blacklist.tt2:9
msgid "The current blacklist contains %1 line(s)"
Expand Down Expand Up @@ -7924,6 +7932,10 @@ msgstr "إدارة البريد العائد"
msgid "edit blacklist"
msgstr "تعديل القائمة السوداء"

#: default/web_tt2/modindex.tt2:158
msgid "edit denylist"
msgstr "تعديل القائمة السوداء"

#: default/web_tt2/modindex.tt2:160
#, fuzzy
msgid "Manage rejection messages"
Expand Down
47 changes: 47 additions & 0 deletions po/sympa/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -5629,10 +5629,18 @@ msgstr ""
msgid "Blacklist:"
msgstr "Llista negra:"

#: default/web_tt2/admin.tt2:17
msgid "Denylist:"
msgstr "Llista negra:"

#: default/web_tt2/admin.tt2:18
msgid "Handles the set of black-listed mail addresses for this list."
msgstr "Gestiona el conjunt d'adreces de la lista negra per a aquesta lista."

#: default/web_tt2/admin.tt2:18
msgid "Handles the set of deny-listed mail addresses for this list."
msgstr "Gestiona el conjunt d'adreces de la lista negra per a aquesta lista."

#: default/web_tt2/admin.tt2:25
msgid "Manage archives:"
msgstr "Gestió d'arxius:"
Expand Down Expand Up @@ -5984,15 +5992,28 @@ msgstr "Informació d'usuari"
msgid "Blacklist management"
msgstr "Gestió de la llista negra"

#: default/web_tt2/blacklist.tt2:3
msgid "Denylist management"
msgstr "Gestió de la llista negra"

#: default/web_tt2/blacklist.tt2:7
msgid "The current blacklist is empty"
msgstr "La llista negra és buida"

#: default/web_tt2/blacklist.tt2:7
msgid "The current denylist is empty"
msgstr "La llista negra és buida"

#. (rows)
#: default/web_tt2/blacklist.tt2:9
msgid "The current blacklist contains %1 line(s)"
msgstr "La llista negra actual conté %1 línia(es)"

#. (rows)
#: default/web_tt2/blacklist.tt2:9
msgid "The current denylist contains %1 line(s)"
msgstr "La llista negra actual conté %1 línia(es)"

#. (conf.use_blacklist)
#: default/web_tt2/blacklist.tt2:12
msgid ""
Expand All @@ -6002,6 +6023,11 @@ msgstr ""
"No s'accepten les operacions sol·licitades pels usuaris de la llista negra. "
"Lallista negra està en ús per a la següent operació: %1"

#. (conf.use_blacklist)
#: default/web_tt2/blacklist.tt2:12
msgid "Operation requested by users which email is listed in the denylist file are rejected. The denylist is in use for the following operation: %1."
msgstr "No s'accepten les operacions sol·licitades pels usuaris de la llista negra. Lallista negra està en ús per a la següent operació: %1"

#: default/web_tt2/blacklist.tt2:15
msgid "Syntax:"
msgstr "Sintaxi:"
Expand Down Expand Up @@ -8256,6 +8282,10 @@ msgstr "Missatge de rebuig per omissió del servidor"
msgid "Add to blacklist"
msgstr "Afegir a la llista negra"

#: default/web_tt2/modindex.tt2:133 default/web_tt2/viewmod.tt2:46
msgid "Add to denylist"
msgstr "Afegir a la llista negra"

#: default/web_tt2/modindex.tt2:142
msgid "No messages to moderate"
msgstr "No hi ha missatges per moderar"
Expand All @@ -8268,6 +8298,10 @@ msgstr "Gestió de la moderació"
msgid "edit blacklist"
msgstr "edita la llista negra"

#: default/web_tt2/modindex.tt2:158
msgid "edit denylist"
msgstr "edita la llista negra"

#: default/web_tt2/modindex.tt2:160
msgid "Manage rejection messages"
msgstr "Gestió dels missatges rebutjats"
Expand Down Expand Up @@ -8389,6 +8423,10 @@ msgstr "Plantilles de missatges"
msgid "Blacklist"
msgstr "Llista negra"

#: default/web_tt2/nav.tt2:376 default/web_tt2/review.tt2:35
msgid "Denylist"
msgstr "Llista negra"

#: default/web_tt2/nav.tt2:388
msgid "Manage Archives"
msgstr "Gestió d'arxius"
Expand Down Expand Up @@ -9489,6 +9527,10 @@ msgstr ""
"d'usuaris. Aquests poden desaparèixer d'aquesta taula d'exclusió a través de "
"les funcions habituals de subscripció."

#: default/web_tt2/show_exclude.tt2:6
msgid "Users listed below are excluded from the list. Beware, that this feature is different from the denylist. Exclusion makes sense when a list is based on external data sources ; thanks to exclusion, a user can unsubscribe (or being removed by list owner) even though they should be included via an external data source. Users get into the exclusion table, through the standard unsubscribe/delete functions. They get off the exclusion table with the standard subscribe/add functions."
msgstr "Els usuaris següents estan exclosos de la llista. Cal aclarir que la llista d'exclusió no és una llista negra. L'exclusió té sentit quan la llista prové d'una font de dades externa. Gràcies a l'exclusió, un usuari pot donar-se de baixa (o ser suprimit pel propietari de la llista) i fins i tot ser inclòs mitjançant una font de dades externa. Els usuaris s'afegeixen a la llista d'exclusió a través de les funcionalitats habituals de baixa o de supressió d'usuaris. Aquests poden desaparèixer d'aquesta taula d'exclusió a través de les funcions habituals de subscripció."

#: default/web_tt2/show_exclude.tt2:57
msgid "No user excluded."
msgstr "Cap subscriptor n'està exclòs."
Expand Down Expand Up @@ -13582,6 +13624,11 @@ msgstr "L'adreça \"%1\" és incorrecta"
msgid "Address \"%1\" belongs to a blacklisted domain"
msgstr "L'adreça «%1» pertany a un domini en la llista negra"

#. (report_param.email || report_param.value)
#: default/mail_tt2/report.tt2:655
msgid "Address \"%1\" belongs to a denylisted domain"
msgstr "L'adreça «%1» pertany a un domini en la llista negra"

#: default/mail_tt2/report.tt2:658
msgid "Provided password is incorrect"
msgstr "La contrasenya és incorrecta"
Expand Down
4 changes: 4 additions & 0 deletions po/sympa/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -5285,6 +5285,10 @@ msgstr ""
msgid "Blacklist:"
msgstr "Zakázané:"

#: default/web_tt2/admin.tt2:17
msgid "Denylist:"
msgstr "Zakázané:"

#: default/web_tt2/admin.tt2:18
msgid "Handles the set of black-listed mail addresses for this list."
msgstr ""
Expand Down
55 changes: 55 additions & 0 deletions po/sympa/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -3500,6 +3500,10 @@ msgstr "Wer die Mail-Adresse von Nutzern ändern kann"
msgid "Use blacklist"
msgstr "Schwarze Liste verwenden"

#: src/lib/Sympa/Config/Schema.pm:1424
msgid "Use denylist"
msgstr "Schwarze Liste verwenden"

#: src/lib/Sympa/Config/Schema.pm:1428
msgid ""
"List of operations separated by comma for which blacklist filter is "
Expand All @@ -3508,6 +3512,10 @@ msgstr ""
"Kommagetrennte Liste der Operationen, für die die Schwarze Liste angewendet "
"wird. Das Setzen dieses Wertes auf \"none\" versteckt die Schwarze Liste."

#: src/lib/Sympa/Config/Schema.pm:1428
msgid "List of operations separated by comma for which denylist filter is applied. Setting this parameter to \"none\" will hide the denylist feature."
msgstr "Kommagetrennte Liste der Operationen, für die die Schwarze Liste angewendet wird. Das Setzen dieses Wertes auf \"none\" versteckt die Schwarze Liste."

#: src/lib/Sympa/Config/Schema.pm:1449
msgid "The subscribe parameter defines the rules for subscribing to the list."
msgstr ""
Expand Down Expand Up @@ -5842,10 +5850,18 @@ msgstr ""
msgid "Blacklist:"
msgstr "Schwarze Liste:"

#: default/web_tt2/admin.tt2:17
msgid "Denylist:"
msgstr "Schwarze Liste:"

#: default/web_tt2/admin.tt2:18
msgid "Handles the set of black-listed mail addresses for this list."
msgstr "Verwaltet die gesperrten Mailadressen für diese Liste."

#: default/web_tt2/admin.tt2:18
msgid "Handles the set of deny-listed mail addresses for this list."
msgstr "Verwaltet die gesperrten Mailadressen für diese Liste."

#: default/web_tt2/admin.tt2:25
msgid "Manage archives:"
msgstr "Archive verwalten:"
Expand Down Expand Up @@ -6200,15 +6216,28 @@ msgstr "Benutzerinformationen"
msgid "Blacklist management"
msgstr "Blacklist verwalten"

#: default/web_tt2/blacklist.tt2:3
msgid "Denylist management"
msgstr "Blacklist verwalten"

#: default/web_tt2/blacklist.tt2:7
msgid "The current blacklist is empty"
msgstr "Die schwarze Liste ist derzeit leer"

#: default/web_tt2/blacklist.tt2:7
msgid "The current denylist is empty"
msgstr "Die schwarze Liste ist derzeit leer"

#. (rows)
#: default/web_tt2/blacklist.tt2:9
msgid "The current blacklist contains %1 line(s)"
msgstr "Die schwarze Liste enthält derzeit %1 Zeile(n)"

#. (rows)
#: default/web_tt2/blacklist.tt2:9
msgid "The current denylist contains %1 line(s)"
msgstr "Die schwarze Liste enthält derzeit %1 Zeile(n)"

#. (conf.use_blacklist)
#: default/web_tt2/blacklist.tt2:12
msgid ""
Expand All @@ -6219,6 +6248,11 @@ msgstr ""
"schwarzen Liste aufgeführt sind, werden zurückgewiesen. Die schwarze Liste "
"gilt für die folgende Aktion: %1."

#. (conf.use_blacklist)
#: default/web_tt2/blacklist.tt2:12
msgid "Operation requested by users which email is listed in the denylist file are rejected. The denylist is in use for the following operation: %1."
msgstr "Aktionen, die von Benutzern angefordert werden, deren E-Mail-Adresse in der schwarzen Liste aufgeführt sind, werden zurückgewiesen. Die schwarze Liste gilt für die folgende Aktion: %1."

#: default/web_tt2/blacklist.tt2:15
msgid "Syntax:"
msgstr "Syntax:"
Expand Down Expand Up @@ -8462,6 +8496,10 @@ msgstr "Vorgegebene Ablehnungsnachricht des Servers"
msgid "Add to blacklist"
msgstr "Zur schwarzen Liste hinzufügen"

#: default/web_tt2/modindex.tt2:133 default/web_tt2/viewmod.tt2:46
msgid "Add to denylist"
msgstr "Zur schwarzen Liste hinzufügen"

#: default/web_tt2/modindex.tt2:142
msgid "No messages to moderate"
msgstr "Keine zu moderierende Nachrichten"
Expand All @@ -8474,6 +8512,10 @@ msgstr "Moderationsverwaltung"
msgid "edit blacklist"
msgstr "Schwarze Liste bearbeiten"

#: default/web_tt2/modindex.tt2:158
msgid "edit denylist"
msgstr "Schwarze Liste bearbeiten"

#: default/web_tt2/modindex.tt2:160
msgid "Manage rejection messages"
msgstr "Ablehnungsnachrichten verwalten"
Expand Down Expand Up @@ -8595,6 +8637,10 @@ msgstr "Nachrichtenvorlagen"
msgid "Blacklist"
msgstr "Schwarze Liste"

#: default/web_tt2/nav.tt2:376 default/web_tt2/review.tt2:35
msgid "Denylist"
msgstr "Schwarze Liste"

#: default/web_tt2/nav.tt2:388
msgid "Manage Archives"
msgstr "Archive verwalten"
Expand Down Expand Up @@ -9702,6 +9748,10 @@ msgstr ""
"Funktionen in die Ausschlusstabelle. Sie werden über die gewöhnlichen "
"Abonnieren/Hinzufügen-Funktionen wieder aus der Ausschlusstabelle entfernt."

#: default/web_tt2/show_exclude.tt2:6
msgid "Users listed below are excluded from the list. Beware, that this feature is different from the denylist. Exclusion makes sense when a list is based on external data sources ; thanks to exclusion, a user can unsubscribe (or being removed by list owner) even though they should be included via an external data source. Users get into the exclusion table, through the standard unsubscribe/delete functions. They get off the exclusion table with the standard subscribe/add functions."
msgstr "Unten aufgelistete Benutzer wurden von der Liste ausgeschlossen. Beachten Sie, dass sich diese Funktion von der Blacklist unterscheidet. Ausschließen kann sinnvoll sein, wenn eine Liste auf externen Datenquellen basiert. Ausgeschlossene Benutzer können sich abmelden (oder vom Listeneigentümer entfernt werden), obwohl sie laut der externen Datenquelle aufgenommen werden sollten. Benutzer gelangen über die gewöhnlichen Abmelden-/Löschen-Funktionen in die Ausschlusstabelle. Sie werden über die gewöhnlichen Abonnieren/Hinzufügen-Funktionen wieder aus der Ausschlusstabelle entfernt."

#: default/web_tt2/show_exclude.tt2:57
msgid "No user excluded."
msgstr "Keine ausgeschlossenen Benutzer."
Expand Down Expand Up @@ -13785,6 +13835,11 @@ msgstr "Adresse \"%1\" ist falsch"
msgid "Address \"%1\" belongs to a blacklisted domain"
msgstr "Adresse \"%1\" gehört zu einer verbotenen Domain"

#. (report_param.email || report_param.value)
#: default/mail_tt2/report.tt2:655
msgid "Address \"%1\" belongs to a denylisted domain"
msgstr "Adresse \"%1\" gehört zu einer verbotenen Domain"

#: default/mail_tt2/report.tt2:658
msgid "Provided password is incorrect"
msgstr "Angegebenes Passwort ist falsch"
Expand Down
Loading

0 comments on commit 6d5eba5

Please sign in to comment.