summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2016-03-15 20:01:28 +0000
committersajolida <sajolida@pimienta.org>2016-03-15 20:01:28 +0000
commit8772b3260d1eca62d62563a21135840490954c10 (patch)
tree644e4ce1ed94e30bc8b009db30467c10e47851d5
parentf7b33e9907e10f6b1a24614445fb868f65f5c764 (diff)
Write 'mailing list' consistently
-rw-r--r--wiki/src/blueprint/UEFI.mdwn2
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/buildbot.mdwn2
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/testing.mdwn2
-rw-r--r--wiki/src/blueprint/better_track_and_document_our_delta_with_Debian.mdwn2
-rw-r--r--wiki/src/blueprint/iceweasel_24.mdwn2
-rw-r--r--wiki/src/blueprint/server_edition.mdwn2
-rw-r--r--wiki/src/contribute/design.mdwn6
-rw-r--r--wiki/src/contribute/design/incremental_upgrades.mdwn2
-rw-r--r--wiki/src/contribute/how/code.mdwn2
-rw-r--r--wiki/src/contribute/how/mirror.mdwn2
-rw-r--r--wiki/src/contribute/how/translate/team/new.mdwn2
-rw-r--r--wiki/src/contribute/how/user_interface.mdwn2
-rw-r--r--wiki/src/contribute/meetings/201311.mdwn4
-rw-r--r--wiki/src/contribute/meetings/201405.mdwn2
-rw-r--r--wiki/src/contribute/meetings/201503.mdwn2
-rw-r--r--wiki/src/contribute/meetings/201511.mdwn2
-rw-r--r--wiki/src/contribute/merge_policy/submit.mdwn2
-rw-r--r--wiki/src/contribute/release_process.mdwn2
-rw-r--r--wiki/src/contribute/release_process/Debian_security_updates.mdwn4
-rw-r--r--wiki/src/contribute/release_process/test.mdwn2
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn2
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn2
-rw-r--r--wiki/src/contribute/working_together/roles/sysadmins.mdwn2
-rw-r--r--wiki/src/doc/about/openpgp_keys.de.po12
-rw-r--r--wiki/src/doc/about/openpgp_keys.fa.po12
-rw-r--r--wiki/src/doc/about/openpgp_keys.fr.po14
-rw-r--r--wiki/src/doc/about/openpgp_keys.mdwn14
-rw-r--r--wiki/src/doc/about/openpgp_keys.pt.po12
-rw-r--r--wiki/src/news/Tails_HackFest_2014.de.po4
-rw-r--r--wiki/src/news/Tails_HackFest_2014.fa.po4
-rw-r--r--wiki/src/news/Tails_HackFest_2014.fr.po4
-rw-r--r--wiki/src/news/Tails_HackFest_2014.mdwn4
-rw-r--r--wiki/src/news/Tails_HackFest_2014.pt.po4
-rw-r--r--wiki/src/news/report_2012_01-04.mdwn4
-rw-r--r--wiki/src/news/report_2012_10.mdwn2
-rw-r--r--wiki/src/news/report_2013_08.mdwn4
-rw-r--r--wiki/src/news/report_2013_12.mdwn2
-rw-r--r--wiki/src/news/report_2014_02.mdwn2
-rw-r--r--wiki/src/news/report_2014_03.mdwn4
-rw-r--r--wiki/src/news/summit_2013.de.po6
-rw-r--r--wiki/src/news/summit_2013.fa.po6
-rw-r--r--wiki/src/news/summit_2013.fr.po6
-rw-r--r--wiki/src/news/summit_2013.mdwn6
-rw-r--r--wiki/src/news/summit_2013.pt.po6
-rw-r--r--wiki/src/tags/announce.mdwn2
45 files changed, 94 insertions, 94 deletions
diff --git a/wiki/src/blueprint/UEFI.mdwn b/wiki/src/blueprint/UEFI.mdwn
index acd970a..0a5831a 100644
--- a/wiki/src/blueprint/UEFI.mdwn
+++ b/wiki/src/blueprint/UEFI.mdwn
@@ -140,7 +140,7 @@ More technical details:
OVMF
----
-* The <edk2-devel@lists.sourceforge.net> mailing-list is the canonical
+* The <edk2-devel@lists.sourceforge.net> mailing list is the canonical
place for discussions on this topic.
* Ubuntu's page about OVMF: <https://wiki.ubuntu.com/UEFI/OVMF>
* <http://www.linux-kvm.org/page/OVMF>
diff --git a/wiki/src/blueprint/automated_builds_and_tests/buildbot.mdwn b/wiki/src/blueprint/automated_builds_and_tests/buildbot.mdwn
index 8f9ec62..e99c64d 100644
--- a/wiki/src/blueprint/automated_builds_and_tests/buildbot.mdwn
+++ b/wiki/src/blueprint/automated_builds_and_tests/buildbot.mdwn
@@ -18,7 +18,7 @@ Our buildbot's instance runs inside a KVM guest managed by libvirt.
work on this.
1. Custom notifications when a build fails: the one currently sent
lacks some useful information.
-2. Request a mailing-list where buildbot would send its build
+2. Request a mailing list where buildbot would send its build
failure reports.
3. Move to a "build in a throw-away VM" approach, so that a given
build cannot taint future ones.
diff --git a/wiki/src/blueprint/automated_builds_and_tests/testing.mdwn b/wiki/src/blueprint/automated_builds_and_tests/testing.mdwn
index 1cfde43..5a16d99 100644
--- a/wiki/src/blueprint/automated_builds_and_tests/testing.mdwn
+++ b/wiki/src/blueprint/automated_builds_and_tests/testing.mdwn
@@ -68,7 +68,7 @@ Mozilla and others:
* [tutorial](http://download.freedesktop.org/ldtp/doc/ldtp-tutorial.pdf)
* The main bindings are Python, but there also are a Ruby client and
Perl bindings in the [Git repo](http://cgit.freedesktop.org/ldtp/ldtp2/tree/ldtp)
-* The LDTP dev mailing-list is very quiet, and it's unclear whether
+* The LDTP dev mailing list is very quiet, and it's unclear whether
GNOME still uses it, or instead switched to dogtail.
## misc
diff --git a/wiki/src/blueprint/better_track_and_document_our_delta_with_Debian.mdwn b/wiki/src/blueprint/better_track_and_document_our_delta_with_Debian.mdwn
index 8d98e00..1ad8fa6 100644
--- a/wiki/src/blueprint/better_track_and_document_our_delta_with_Debian.mdwn
+++ b/wiki/src/blueprint/better_track_and_document_our_delta_with_Debian.mdwn
@@ -75,7 +75,7 @@ Next steps
* This is being discussed in the [Tracking derivatives delta:
explanations, history](https://lists.debian.org/85r41tx7k4.fsf@boum.org)
- thread on the debian-derivatives mailing-list.
+ thread on the debian-derivatives mailing list.
* Action items: [[!tails_ticket 7607]] and subtasks
Misc. ideas
diff --git a/wiki/src/blueprint/iceweasel_24.mdwn b/wiki/src/blueprint/iceweasel_24.mdwn
index 3f70c4e..2e43f8a 100644
--- a/wiki/src/blueprint/iceweasel_24.mdwn
+++ b/wiki/src/blueprint/iceweasel_24.mdwn
@@ -36,7 +36,7 @@ Guidelines for testers
1. **Reporting success** — When something works fine, please add it to
the *Known working* section below. If you don't have Git commit
bit, and have no personal Tails Git repo, report success to the
- email thread on the tails-dev mailing-list, or to intrigeri on IRC.
+ email thread on the tails-dev mailing list, or to intrigeri on IRC.
1. **If in doubt** — Ask intrigeri on IRC (`#tails-dev`).
diff --git a/wiki/src/blueprint/server_edition.mdwn b/wiki/src/blueprint/server_edition.mdwn
index 92fd4ad..dd7972e 100644
--- a/wiki/src/blueprint/server_edition.mdwn
+++ b/wiki/src/blueprint/server_edition.mdwn
@@ -332,7 +332,7 @@ When a new version of Tails is available, the server admin should be warned
about this. Tails already implements this mechanism in it's GUI, but as Tails
server cannot rely on GUI in its normal operation, this must be redesigned.
As a placeholder, the admin should be invited to subscribe to the amnesia-
-news mailing-list.
+news mailing list.
Tails server configuration GUI
------------------------------
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 7a168e6..49734d4 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -399,7 +399,7 @@ IP provided by the ISP when one asks information about themselves to
their DNS resolver (source: [The State of the DNS and Tor Union (also:
a DNS UDP
- TCP shim)](http://archives.seul.org/or/talk/Jul-2010/msg00007.html)
-thread on the or-talk mailing-list).
+thread on the or-talk mailing list).
Any exception to these rules MUST be thoroughly thought through and
properly documented. If an action that is excepted from the above
@@ -627,7 +627,7 @@ unionfs/aufs ramdisk branch.
This was
[discussed](http://archives.seul.org/or/talk/Jan-2011/msg00137.html)
-on the or-talk mailing-list, and a new system that mitigates such
+on the or-talk mailing list, and a new system that mitigates such
attacks is part of Tails 0.7 and newer.
This specification must warn about such matters.
@@ -645,7 +645,7 @@ document on the Tor wiki:
The impact of HTTP keepalive and possible solutions are [being
discussed](http://thread.gmane.org/gmane.linux.distributions.tails.devel/52)
-on the [[tails-dev@boum.org|doc/about/contact#tails-dev]] mailing-list.
+on the [[tails-dev@boum.org|doc/about/contact#tails-dev]] mailing list.
### 2.7.3 Mounting of filesystems stored on removable devices
diff --git a/wiki/src/contribute/design/incremental_upgrades.mdwn b/wiki/src/contribute/design/incremental_upgrades.mdwn
index 4596d37..000ac85 100644
--- a/wiki/src/contribute/design/incremental_upgrades.mdwn
+++ b/wiki/src/contribute/design/incremental_upgrades.mdwn
@@ -584,7 +584,7 @@ new releases in other ways:
* one that does not rely on our website to be safe at the time Tails
Upgrader checks for available upgrades, as long as it was safe at
the time the new release was published (<amnesia-news@boum.org>
- announce mailing-list).
+ announce mailing list).
The move to a secure upgrade system, such as TUF, would make this
stronger, thanks to short-lived signatures on meta-data.
diff --git a/wiki/src/contribute/how/code.mdwn b/wiki/src/contribute/how/code.mdwn
index 3151cee..4fa276c 100644
--- a/wiki/src/contribute/how/code.mdwn
+++ b/wiki/src/contribute/how/code.mdwn
@@ -99,7 +99,7 @@ implement. At this point, we advise you to:
1. **Gather results of previous research and discussions** on the
topic you are interested in. Search this website, [[!tails_redmine ""
- desc="tickets on Redmine"]] and the [tails-dev@boum.org mailing-list
+ desc="tickets on Redmine"]] and the [tails-dev@boum.org mailing list
archive](https://mailman.boum.org/pipermail/tails-dev/).
2. **[[Tell us|contribute/talk]] about your plans** to make sure your
idea fits nicely into the [[big picture|contribute/design]], and
diff --git a/wiki/src/contribute/how/mirror.mdwn b/wiki/src/contribute/how/mirror.mdwn
index ae266ee..1763f5f 100644
--- a/wiki/src/contribute/how/mirror.mdwn
+++ b/wiki/src/contribute/how/mirror.mdwn
@@ -46,7 +46,7 @@ BitTorrent|contribute/how/mirror/automatically_download_and_seed_Tails_over_BitT
Else, new versions are announced on:
* our [news
- mailing-list](https://mailman.boum.org/listinfo/amnesia-news)
+ mailing list](https://mailman.boum.org/listinfo/amnesia-news)
* our <a href='/torrents/rss/index.rss'>RSS</a> and
<a href='/torrents/rss/index.atom'>Atom</a> feeds that announce new available
BitTorrent files.
diff --git a/wiki/src/contribute/how/translate/team/new.mdwn b/wiki/src/contribute/how/translate/team/new.mdwn
index 51b90ba..52f0226 100644
--- a/wiki/src/contribute/how/translate/team/new.mdwn
+++ b/wiki/src/contribute/how/translate/team/new.mdwn
@@ -41,7 +41,7 @@ hesitate to report about your progress, and to ask for help, on the
[[mailing list for translators|translate#follow-up]] :)
As soon as the translations of core pages reach 25%, you can ask on
-the mailing-list for your language to be enabled on the website. If
+the mailing list for your language to be enabled on the website. If
the translations go below 25% later, it will be disabled from the
website. When the core pages are completely translated, you can start
translating other parts of the website. It is also good to translate
diff --git a/wiki/src/contribute/how/user_interface.mdwn b/wiki/src/contribute/how/user_interface.mdwn
index d16c399..31d2a9c 100644
--- a/wiki/src/contribute/how/user_interface.mdwn
+++ b/wiki/src/contribute/how/user_interface.mdwn
@@ -28,4 +28,4 @@ Resources
Talk to us
==========
-You can subscribe to the [[tails-ux|doc/about/contact#tails-ux]] mailing-list.
+You can subscribe to the [[tails-ux|doc/about/contact#tails-ux]] mailing list.
diff --git a/wiki/src/contribute/meetings/201311.mdwn b/wiki/src/contribute/meetings/201311.mdwn
index b1cf68b..077ebb7 100644
--- a/wiki/src/contribute/meetings/201311.mdwn
+++ b/wiki/src/contribute/meetings/201311.mdwn
@@ -4,7 +4,7 @@ Agenda
======
1. Evaluate our progress especially on these action items:
- * tails-support public mailing-list
+ * tails-support public mailing list
* Collect the frequent questions and answers from the old forum in
a FAQ on /support/frequently_asked_questions redirected from
/support/faq.
@@ -30,7 +30,7 @@ As decided in the user support "Great plan for now"
it is now time to evaluate our progress in this area,
especially on these action items:
-* tails-support public mailing-list
+* tails-support public mailing list
We decided to file a ticket for changing the warning for using
tails-support more informative and not needlessly scary.
diff --git a/wiki/src/contribute/meetings/201405.mdwn b/wiki/src/contribute/meetings/201405.mdwn
index ffe136e..2c5a1ca 100644
--- a/wiki/src/contribute/meetings/201405.mdwn
+++ b/wiki/src/contribute/meetings/201405.mdwn
@@ -100,7 +100,7 @@ Can I use my participation in Tails to improve my portfolio?
Even if the core team is used to sign its commit with the same name,
Tails developer, nothing prevent contributors from signing their own
-commits. Tickets on Redmine have assignees. Posts on the mailing-list
+commits. Tickets on Redmine have assignees. Posts on the mailing list
are not anonymized. So that can possibly give a portfolio.
Some people already do that:
diff --git a/wiki/src/contribute/meetings/201503.mdwn b/wiki/src/contribute/meetings/201503.mdwn
index 1682eb4..3af0247 100644
--- a/wiki/src/contribute/meetings/201503.mdwn
+++ b/wiki/src/contribute/meetings/201503.mdwn
@@ -41,7 +41,7 @@ We decided that the problem space of this ticket is not appropriate for a monthl
Instead please read the [blueprint](https://tails.boum.org/blueprint/bootstrapping/extension/#verification)
and comment on the [mailing list thread](https://mailman.boum.org/pipermail/tails-dev/2015-March/008333.html).
-# Important tickets with milestone, but without assignee, see the [mailing-list](https://mailman.boum.org/pipermail/tails-dev/2015-February/008239.html)
+# Important tickets with milestone, but without assignee, see the [mailing list](https://mailman.boum.org/pipermail/tails-dev/2015-February/008239.html)
The questions is: How do we handle unexpected and high-priority tasks, when all the people who usually do this are already overwhelmed?
diff --git a/wiki/src/contribute/meetings/201511.mdwn b/wiki/src/contribute/meetings/201511.mdwn
index 56b2481..aa56085 100644
--- a/wiki/src/contribute/meetings/201511.mdwn
+++ b/wiki/src/contribute/meetings/201511.mdwn
@@ -24,7 +24,7 @@
Given how most of the last times went, where some people attended but
nothing happened, it seems necessary to discuss a bit more of this
-sessions. An email will be sent on the tails-dev mailing-list by muri to
+sessions. An email will be sent on the tails-dev mailing list by muri to
raise the issue, and until we settle on a better plan, the LHF sessions
won't be announced anymore.
diff --git a/wiki/src/contribute/merge_policy/submit.mdwn b/wiki/src/contribute/merge_policy/submit.mdwn
index db238e0..3428575 100644
--- a/wiki/src/contribute/merge_policy/submit.mdwn
+++ b/wiki/src/contribute/merge_policy/submit.mdwn
@@ -20,7 +20,7 @@ When the developer thinks it is good enough and has tested it, she must:
like your changes to be in
- for important changes, if you feel the need to ask input from the
greater development community, notify the [[tails-dev@boum.org|doc/about/contact#tails-dev]]
- mailing-list
+ mailing list
Then, if the [[reviewer|contribute/merge_policy/review]] asks for more
development to be done before
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 5c5359b..5947e10 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -803,7 +803,7 @@ Write the announcement for the release in
- Update the `meta title` directive.
- Update the `meta date` directive.
- Make sure there's an `announce` tag to have an email sent to the
- news mailing-list.
+ news mailing list.
- Document important config changes that persistence users have to do
themselves (e.g. the Pidgin proxy settings change in
[[!tails_gitweb_commit 9925321]] breaks all existing persistent
diff --git a/wiki/src/contribute/release_process/Debian_security_updates.mdwn b/wiki/src/contribute/release_process/Debian_security_updates.mdwn
index 06bdaf3..5814ca2 100644
--- a/wiki/src/contribute/release_process/Debian_security_updates.mdwn
+++ b/wiki/src/contribute/release_process/Debian_security_updates.mdwn
@@ -21,9 +21,9 @@ Security tracker
The Debian [security tracker][web]'s [SVN repository][svn] is the main
place where we can look at the Debian security team upcoming uploads
-and announces. There is also a [mailing-list][] that broadcasts
+and announces. There is also a [mailing list][] that broadcasts
changes to this repository.
[web]: http://security-tracker.debian.org/tracker/
[svn]: http://svn.debian.org/wsvn/secure-testing
-[mailing-list]: http://lists.alioth.debian.org/mailman/listinfo/secure-testing-commits
+[mailing list]: http://lists.alioth.debian.org/mailman/listinfo/secure-testing-commits
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 577a848..c73c5f2 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -146,7 +146,7 @@ tracked by tickets prefixed with `todo/test_suite:`.
# WhisperBack
* I should be able to send a bug report with WhisperBack.
-* When we receive this bug report on the tails-bugs mailing-list,
+* When we receive this bug report on the tails-bugs mailing list,
Schleuder tells us that it was sent encrypted.
# Root access control
diff --git a/wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn
index 6517d3c4..d6a36f1 100644
--- a/wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn
+++ b/wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn
@@ -140,7 +140,7 @@ once they are built
and when, how to process, advertise, and store the results
An initial draft design was written, posted on our development
- mailing-list, and as a result the discussion has started but was not
+ mailing list, and as a result the discussion has started but was not
completed yet.
B.3. Extend the coverage of our test suite
diff --git a/wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn
index 3d3886b..63d4ff8 100644
--- a/wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn
+++ b/wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn
@@ -112,7 +112,7 @@ Still, aside of the achievements described below:
- We identified issues on Jessie with the AppArmor profile for CUPS
(#9963). The Tails-specific part was corrected,
and more generic maintainability issues were raised on the upstream
- mailing-list.
+ mailing list.
https://labs.riseup.net/code/issues/9963
diff --git a/wiki/src/contribute/working_together/roles/sysadmins.mdwn b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
index 156b6db..fd68207 100644
--- a/wiki/src/contribute/working_together/roles/sysadmins.mdwn
+++ b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
@@ -96,7 +96,7 @@ The main tools used to manage the Tails infrastructure are:
A few people have write access to the puppetmasters, and can log into
the hosts.
-They read the <tails-sysadmins@boum.org> encrypted mailing-list.
+They read the <tails-sysadmins@boum.org> encrypted mailing list.
We use Redmine tickets for public discussion and tasks management:
diff --git a/wiki/src/doc/about/openpgp_keys.de.po b/wiki/src/doc/about/openpgp_keys.de.po
index f16b7af..371d76e 100644
--- a/wiki/src/doc/about/openpgp_keys.de.po
+++ b/wiki/src/doc/about/openpgp_keys.de.po
@@ -58,7 +58,7 @@ msgstr "<a id=\"private\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Private mailing-list key\n"
+msgid "Private mailing list key\n"
msgstr "Privater Mailinglisten-Schlüssel\n"
#. type: Title -
@@ -74,7 +74,7 @@ msgstr "Verschlüsselung"
#. type: Plain text
msgid ""
"This key has an encryption subkey. Please use it to encrypt email sent to "
-"the core developers encrypted mailing-list: <tails@boum.org>."
+"the core developers encrypted mailing list: <tails@boum.org>."
msgstr ""
"Dieser Schlüssel hat einen Unterschlüssel für Verschlüsselung. Bitte nutzen "
"Sie ihn, um E-Mails zu verschlüsseln, die an die verschlüsselte Mailingliste "
@@ -90,8 +90,8 @@ msgid ""
"This key also has the capability to sign and certify. Until Tails 0.5 and "
"0.6~rc3, released images were signed by this key. This purpose is now "
"deprecated: further releases will be signed by a dedicated, safer signing "
-"key. As of 2010 October 7th, our mailing-list key signature only means our "
-"mailing-list software checked the signed content was originally OpenPGP-"
+"key. As of 2010 October 7th, our mailing list key signature only means our "
+"mailing list software checked the signed content was originally OpenPGP-"
"signed by a Tails core developer."
msgstr ""
"Dieser Schlüssel kann auch Signieren und Zertifizieren. Bis Tails 0.5 und "
@@ -110,7 +110,7 @@ msgstr "Richtlinien\n"
#. type: Plain text
msgid ""
"The secret key material and its passphrase are stored on the server that "
-"runs our encrypted mailing-list software and on systems managed by core "
+"runs our encrypted mailing list software and on systems managed by core "
"Tails developers."
msgstr ""
"Der private Schlüssel und seine Passphrase sind auf dem Server hinterlegt, "
@@ -121,7 +121,7 @@ msgstr ""
msgid ""
"This means people other than Tails developers are in a position to use this "
"secret key. Tails developers trust these people enough to rely on them for "
-"running our encrypted mailing-list, but still: this key pair is managed in a "
+"running our encrypted mailing list, but still: this key pair is managed in a "
"less safe way than our signing key."
msgstr ""
"Das heißt, dass Personen, die keine Tails Entwickler sind, die Möglichkeit "
diff --git a/wiki/src/doc/about/openpgp_keys.fa.po b/wiki/src/doc/about/openpgp_keys.fa.po
index 4738982..065960e 100644
--- a/wiki/src/doc/about/openpgp_keys.fa.po
+++ b/wiki/src/doc/about/openpgp_keys.fa.po
@@ -60,7 +60,7 @@ msgstr "<a id=\"private\"></a>\n"
#. type: Title =
#, no-wrap
-msgid "Private mailing-list key\n"
+msgid "Private mailing list key\n"
msgstr "کلید خصوصی فهرست رایانامه\n"
#. type: Title -
@@ -76,7 +76,7 @@ msgstr "رمزگذاری"
#. type: Plain text
msgid ""
"This key has an encryption subkey. Please use it to encrypt email sent to "
-"the core developers encrypted mailing-list: <tails@boum.org>."
+"the core developers encrypted mailing list: <tails@boum.org>."
msgstr ""
"این کلید دارای یک زیرکلید رمزگذاری‌شده است. از آن برای رمزگذاری رایانامه به "
"فهرست رایانامهٔ توسعه‌دهندگان مرکزی که رمزگذاری شده‌است استفاده کنید: "
@@ -92,8 +92,8 @@ msgid ""
"This key also has the capability to sign and certify. Until Tails 0.5 and "
"0.6~rc3, released images were signed by this key. This purpose is now "
"deprecated: further releases will be signed by a dedicated, safer signing "
-"key. As of 2010 October 7th, our mailing-list key signature only means our "
-"mailing-list software checked the signed content was originally OpenPGP-"
+"key. As of 2010 October 7th, our mailing list key signature only means our "
+"mailing list software checked the signed content was originally OpenPGP-"
"signed by a Tails core developer."
msgstr ""
"با این کلید همچنین می‌توان امضا کرد. تا نسخهٔ ۰٫۵ و ~rc3۰٫۶ عکس‌های منتشرشده با "
@@ -110,7 +110,7 @@ msgstr "سیاست\n"
#. type: Plain text
msgid ""
"The secret key material and its passphrase are stored on the server that "
-"runs our encrypted mailing-list software and on systems managed by core "
+"runs our encrypted mailing list software and on systems managed by core "
"Tails developers."
msgstr ""
"محتویات کلید خصوصی و گذرواژهٔ آن روی سروری که نرم‌افزار فهرست رایانامهٔ ما را "
@@ -121,7 +121,7 @@ msgstr ""
msgid ""
"This means people other than Tails developers are in a position to use this "
"secret key. Tails developers trust these people enough to rely on them for "
-"running our encrypted mailing-list, but still: this key pair is managed in a "
+"running our encrypted mailing list, but still: this key pair is managed in a "
"less safe way than our signing key."
msgstr ""
"یعنی کسانی به غیر از توسعه‌دهندگان تیلز می‌توانند از این کلید خصوصی استفاده "
diff --git a/wiki/src/doc/about/openpgp_keys.fr.po b/wiki/src/doc/about/openpgp_keys.fr.po
index 10e6914..4cc0352 100644
--- a/wiki/src/doc/about/openpgp_keys.fr.po
+++ b/wiki/src/doc/about/openpgp_keys.fr.po
@@ -56,7 +56,7 @@ msgstr ""
#. type: Title =
#, no-wrap
-msgid "Private mailing-list key\n"
+msgid "Private mailing list key\n"
msgstr "Clé de la liste de discussion privée\n"
#. type: Title -
@@ -72,7 +72,7 @@ msgstr "Chiffrement"
#. type: Plain text
msgid ""
"This key has an encryption subkey. Please use it to encrypt email sent to "
-"the core developers encrypted mailing-list: <tails@boum.org>."
+"the core developers encrypted mailing list: <tails@boum.org>."
msgstr ""
"Cette clé a une sous-clé de chiffrement. Merci de l'utiliser pour chiffrer "
"les\n"
@@ -88,8 +88,8 @@ msgid ""
"This key also has the capability to sign and certify. Until Tails 0.5 and "
"0.6~rc3, released images were signed by this key. This purpose is now "
"deprecated: further releases will be signed by a dedicated, safer signing "
-"key. As of 2010 October 7th, our mailing-list key signature only means our "
-"mailing-list software checked the signed content was originally OpenPGP-"
+"key. As of 2010 October 7th, our mailing list key signature only means our "
+"mailing list software checked the signed content was originally OpenPGP-"
"signed by a Tails core developer."
msgstr ""
"Cette clé peut également signer et certifier. Jusqu'à Tails 0.5 et 0.6~rc3,\n"
@@ -97,7 +97,7 @@ msgstr ""
"versions\n"
"publiées seront signées par une clé dédiée, plus sûre. Depuis le 7 octobre "
"2010,\n"
-"la signature de la clé de notre mailing-list signifie seulement que le "
+"la signature de la clé de notre mailing list signifie seulement que le "
"contenu\n"
"signé était originellement signé par un développeur principal de Tails."
@@ -109,7 +109,7 @@ msgstr "Nos engagements\n"
#. type: Plain text
msgid ""
"The secret key material and its passphrase are stored on the server that "
-"runs our encrypted mailing-list software and on systems managed by core "
+"runs our encrypted mailing list software and on systems managed by core "
"Tails developers."
msgstr ""
"La clé secrète et sa phrase de passe sont stockées sur le serveur qui fait\n"
@@ -121,7 +121,7 @@ msgstr ""
msgid ""
"This means people other than Tails developers are in a position to use this "
"secret key. Tails developers trust these people enough to rely on them for "
-"running our encrypted mailing-list, but still: this key pair is managed in a "
+"running our encrypted mailing list, but still: this key pair is managed in a "
"less safe way than our signing key."
msgstr ""
"Cela signifie que d'autres personnes que les développeurs Tails ont accès à\n"
diff --git a/wiki/src/doc/about/openpgp_keys.mdwn b/wiki/src/doc/about/openpgp_keys.mdwn
index d85fe3f..8fc6a12 100644
--- a/wiki/src/doc/about/openpgp_keys.mdwn
+++ b/wiki/src/doc/about/openpgp_keys.mdwn
@@ -14,7 +14,7 @@ on the keyservers.</p>
<a id="private"></a>
-Private mailing-list key
+Private mailing list key
========================
Purpose
@@ -23,27 +23,27 @@ Purpose
### Encryption
This key has an encryption subkey. Please use it to encrypt email sent
-to the core developers encrypted mailing-list: [[tails@boum.org|/doc/about/contact#tails]].
+to the core developers encrypted mailing list: [[tails@boum.org|/doc/about/contact#tails]].
### Signature
This key also has the capability to sign and certify. Until Tails
0.5 and 0.6~rc3, released images were signed by this key. This purpose
is now deprecated: further releases will be signed by a dedicated,
-safer signing key. As of 2010 October 7th, our mailing-list key
-signature only means our mailing-list software checked the signed
+safer signing key. As of 2010 October 7th, our mailing list key
+signature only means our mailing list software checked the signed
content was originally OpenPGP-signed by a Tails core developer.
Policy
------
The secret key material and its passphrase are stored on the server
-that runs our encrypted mailing-list software and on systems managed
+that runs our encrypted mailing list software and on systems managed
by core Tails developers.
This means people other than Tails developers are in a position to
use this secret key. Tails developers trust these people enough to
-rely on them for running our encrypted mailing-list, but still: this
+rely on them for running our encrypted mailing list, but still: this
key pair is managed in a less safe way than our signing key.
Key details
@@ -151,7 +151,7 @@ Policy
------
The secret key material and its passphrase are stored on the server
-that runs our encrypted mailing-list software and on systems managed
+that runs our encrypted mailing list software and on systems managed
by core Tails developers.
Key details
diff --git a/wiki/src/doc/about/openpgp_keys.pt.po b/wiki/src/doc/about/openpgp_keys.pt.po
index cc5f6e0..cc7469c 100644
--- a/wiki/src/doc/about/openpgp_keys.pt.po
+++ b/wiki/src/doc/about/openpgp_keys.pt.po
@@ -57,7 +57,7 @@ msgstr ""
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Mailing-list key\n"
-msgid "Private mailing-list key\n"
+msgid "Private mailing list key\n"
msgstr "Chave da lista de discussão\n"
#. type: Title -
@@ -73,7 +73,7 @@ msgstr "Criptografia"
#. type: Plain text
msgid ""
"This key has an encryption subkey. Please use it to encrypt email sent to "
-"the core developers encrypted mailing-list: <tails@boum.org>."
+"the core developers encrypted mailing list: <tails@boum.org>."
msgstr ""
"Esta chave possui uma subchave de criptografia. Por gentileza utilize-a para "
"criptografar emails enviados para a lista criptografada de desenvolvimento: "
@@ -89,8 +89,8 @@ msgid ""
"This key also has the capability to sign and certify. Until Tails 0.5 and "
"0.6~rc3, released images were signed by this key. This purpose is now "
"deprecated: further releases will be signed by a dedicated, safer signing "
-"key. As of 2010 October 7th, our mailing-list key signature only means our "
-"mailing-list software checked the signed content was originally OpenPGP-"
+"key. As of 2010 October 7th, our mailing list key signature only means our "
+"mailing list software checked the signed content was originally OpenPGP-"
"signed by a Tails core developer."
msgstr ""
"Esta chave também possui a capacidade de assinar e certificar. Até o Tails "
@@ -110,7 +110,7 @@ msgstr "Política\n"
#. type: Plain text
msgid ""
"The secret key material and its passphrase are stored on the server that "
-"runs our encrypted mailing-list software and on systems managed by core "
+"runs our encrypted mailing list software and on systems managed by core "
"Tails developers."
msgstr ""
"O material secreto da chave e sua senha são armazenados no servidor onde o "
@@ -121,7 +121,7 @@ msgstr ""
msgid ""
"This means people other than Tails developers are in a position to use this "
"secret key. Tails developers trust these people enough to rely on them for "
-"running our encrypted mailing-list, but still: this key pair is managed in a "
+"running our encrypted mailing list, but still: this key pair is managed in a "
"less safe way than our signing key."
msgstr ""
"Isso significa que pessoas que não são desenvolvedoras do Tails estão numa "
diff --git a/wiki/src/news/Tails_HackFest_2014.de.po b/wiki/src/news/Tails_HackFest_2014.de.po
index 5941e98..6be871c 100644
--- a/wiki/src/news/Tails_HackFest_2014.de.po
+++ b/wiki/src/news/Tails_HackFest_2014.de.po
@@ -104,12 +104,12 @@ msgstr ""
#, no-wrap
msgid ""
"* <tails-project@boum.org>: public, archived\n"
-"[mailing-list](https://mailman.boum.org/listinfo/tails-project) to\n"
+"[mailing list](https://mailman.boum.org/listinfo/tails-project) to\n"
"talk about the non-technical decisions regarding the project.\n"
"* <tails-press@boum.org>: the new contact for journalists and people\n"
"wanting to promote Tails. Just write to <tails-press@boum.org>. You\n"
"can encrypt your email.\n"
"* <tails-ux@boum.org>: public, archived\n"
-"[mailing-list](https://mailman.boum.org/listinfo/tails-ux) to discuss\n"
+"[mailing list](https://mailman.boum.org/listinfo/tails-ux) to discuss\n"
"Tails website and software user interfaces.\n"
msgstr ""
diff --git a/wiki/src/news/Tails_HackFest_2014.fa.po b/wiki/src/news/Tails_HackFest_2014.fa.po
index 6559961..79bf809 100644
--- a/wiki/src/news/Tails_HackFest_2014.fa.po
+++ b/wiki/src/news/Tails_HackFest_2014.fa.po
@@ -125,13 +125,13 @@ msgstr "فهرست‌های جدید رایانامه\n"
#, no-wrap
msgid ""
"* <tails-project@boum.org>: public, archived\n"
-"[mailing-list](https://mailman.boum.org/listinfo/tails-project) to\n"
+"[mailing list](https://mailman.boum.org/listinfo/tails-project) to\n"
"talk about the non-technical decisions regarding the project.\n"
"* <tails-press@boum.org>: the new contact for journalists and people\n"
"wanting to promote Tails. Just write to <tails-press@boum.org>. You\n"
"can encrypt your email.\n"
"* <tails-ux@boum.org>: public, archived\n"
-"[mailing-list](https://mailman.boum.org/listinfo/tails-ux) to discuss\n"
+"[mailing list](https://mailman.boum.org/listinfo/tails-ux) to discuss\n"
"Tails website and software user interfaces.\n"
msgstr ""
"* <tails-project@boum.org>: فهرست رایانامهٔ عمومی\n"
diff --git a/wiki/src/news/Tails_HackFest_2014.fr.po b/wiki/src/news/Tails_HackFest_2014.fr.po
index 5941e98..6be871c 100644
--- a/wiki/src/news/Tails_HackFest_2014.fr.po
+++ b/wiki/src/news/Tails_HackFest_2014.fr.po
@@ -104,12 +104,12 @@ msgstr ""
#, no-wrap
msgid ""
"* <tails-project@boum.org>: public, archived\n"
-"[mailing-list](https://mailman.boum.org/listinfo/tails-project) to\n"
+"[mailing list](https://mailman.boum.org/listinfo/tails-project) to\n"
"talk about the non-technical decisions regarding the project.\n"
"* <tails-press@boum.org>: the new contact for journalists and people\n"
"wanting to promote Tails. Just write to <tails-press@boum.org>. You\n"
"can encrypt your email.\n"
"* <tails-ux@boum.org>: public, archived\n"
-"[mailing-list](https://mailman.boum.org/listinfo/tails-ux) to discuss\n"
+"[mailing list](https://mailman.boum.org/listinfo/tails-ux) to discuss\n"
"Tails website and software user interfaces.\n"
msgstr ""
diff --git a/wiki/src/news/Tails_HackFest_2014.mdwn b/wiki/src/news/Tails_HackFest_2014.mdwn
index 5c71863..fa93c10 100644
--- a/wiki/src/news/Tails_HackFest_2014.mdwn
+++ b/wiki/src/news/Tails_HackFest_2014.mdwn
@@ -37,11 +37,11 @@ New mailing lists
=================
* <tails-project@boum.org>: public, archived
-[mailing-list](https://mailman.boum.org/listinfo/tails-project) to
+[mailing list](https://mailman.boum.org/listinfo/tails-project) to
talk about the non-technical decisions regarding the project.
* <tails-press@boum.org>: the new contact for journalists and people
wanting to promote Tails. Just write to <tails-press@boum.org>. You
can encrypt your email.
* <tails-ux@boum.org>: public, archived
-[mailing-list](https://mailman.boum.org/listinfo/tails-ux) to discuss
+[mailing list](https://mailman.boum.org/listinfo/tails-ux) to discuss
Tails website and software user interfaces.
diff --git a/wiki/src/news/Tails_HackFest_2014.pt.po b/wiki/src/news/Tails_HackFest_2014.pt.po
index 5941e98..6be871c 100644
--- a/wiki/src/news/Tails_HackFest_2014.pt.po
+++ b/wiki/src/news/Tails_HackFest_2014.pt.po
@@ -104,12 +104,12 @@ msgstr ""
#, no-wrap
msgid ""
"* <tails-project@boum.org>: public, archived\n"
-"[mailing-list](https://mailman.boum.org/listinfo/tails-project) to\n"
+"[mailing list](https://mailman.boum.org/listinfo/tails-project) to\n"
"talk about the non-technical decisions regarding the project.\n"
"* <tails-press@boum.org>: the new contact for journalists and people\n"
"wanting to promote Tails. Just write to <tails-press@boum.org>. You\n"
"can encrypt your email.\n"
"* <tails-ux@boum.org>: public, archived\n"
-"[mailing-list](https://mailman.boum.org/listinfo/tails-ux) to discuss\n"
+"[mailing list](https://mailman.boum.org/listinfo/tails-ux) to discuss\n"
"Tails website and software user interfaces.\n"
msgstr ""
diff --git a/wiki/src/news/report_2012_01-04.mdwn b/wiki/src/news/report_2012_01-04.mdwn
index 2b1fb4f..34e1223 100644
--- a/wiki/src/news/report_2012_01-04.mdwn
+++ b/wiki/src/news/report_2012_01-04.mdwn
@@ -39,7 +39,7 @@ Internationalization
We setup the
[tails-l10n](https://mailman.boum.org/listinfo/tails-l10n/)
-mailing-list, that was of great use to coordinate documentation
+mailing list, that was of great use to coordinate documentation
writers, developers and translators during the 0.11 release cycle.
Translators are [[more than welcome|contribute/how/translate]]!
@@ -63,7 +63,7 @@ can migrate a few of our custom applications to GTK3 once Tails builds
upon Wheezy.
In January, we have replied to Jacob Appelbaum about the many
-suggestions he sent us. See the tails-dev mailing-list archives
+suggestions he sent us. See the tails-dev mailing list archives
for details.
And now?
diff --git a/wiki/src/news/report_2012_10.mdwn b/wiki/src/news/report_2012_10.mdwn
index 351bbef..e24eabd 100644
--- a/wiki/src/news/report_2012_10.mdwn
+++ b/wiki/src/news/report_2012_10.mdwn
@@ -1,7 +1,7 @@
[[!meta date="Fri Nov 2 09:00:00 2012 +0000"]]
[[!meta title="Tails report for October, 2012"]]
-October 2012 has seen the highest activity on Tails development mailing-list
+October 2012 has seen the highest activity on Tails development mailing list
since it is publicly archived (September 2010). This reflects how much
work is done to slowly make Tails better and better. More details follow.
diff --git a/wiki/src/news/report_2013_08.mdwn b/wiki/src/news/report_2013_08.mdwn
index bed0d86..8aa4467 100644
--- a/wiki/src/news/report_2013_08.mdwn
+++ b/wiki/src/news/report_2013_08.mdwn
@@ -60,7 +60,7 @@ Code
- Starting with Tails 0.20.1, bug reports sent with WhisperBack will
[[!tails_gitweb_branch feature/tails-bugs desc="be sent to
- a dedicated (encrypted) mailing-list"]].
+ a dedicated (encrypted) mailing list"]].
- GnuPG now [[!tails_gitweb_branch feature/GnuPG-no-emit-version
desc="uses --no-emit-version"]].
@@ -104,7 +104,7 @@ Documentation and Website
and [proposed for
review](https://mailman.boum.org/pipermail/tails-dev/2013-August/003427.html).
-- The shiny new tails-support mailing-list [[was documented|support]].
+- The shiny new tails-support mailing list [[was documented|support]].
- The [[news]] page now has a form to subscribe to amnesia-news and
mentions Twitter.
diff --git a/wiki/src/news/report_2013_12.mdwn b/wiki/src/news/report_2013_12.mdwn
index 026692e..ac41a50 100644
--- a/wiki/src/news/report_2013_12.mdwn
+++ b/wiki/src/news/report_2013_12.mdwn
@@ -98,7 +98,7 @@ Documentation and website
instructions|doc/first_steps/installation/manual/mac]] were made
a bit safer.
- The links to files and branches in cgit were fixed.
-- The tails-support mailing-list is now mentioned on [[Help other
+- The tails-support mailing list is now mentioned on [[Help other
Tails users|contribute/how/help]].
- The documentation for incremental upgrades was written.
- The documentation for MAC spoofing was drafted.
diff --git a/wiki/src/news/report_2014_02.mdwn b/wiki/src/news/report_2014_02.mdwn
index ed47cf8..25de60e 100644
--- a/wiki/src/news/report_2014_02.mdwn
+++ b/wiki/src/news/report_2014_02.mdwn
@@ -132,7 +132,7 @@ Infrastructure
Thanks to this and the robustness improvements brought by the move
to RJB, we were finally able to remove two of the most painful sets
of tests from our manual test suite.
-- A mailing-list for early testers was created and is being set up.
+- A mailing list for early testers was created and is being set up.
On-going discussions
====================
diff --git a/wiki/src/news/report_2014_03.mdwn b/wiki/src/news/report_2014_03.mdwn
index 3e69b20..c65a619 100644
--- a/wiki/src/news/report_2014_03.mdwn
+++ b/wiki/src/news/report_2014_03.mdwn
@@ -105,13 +105,13 @@ Translation
- The German team which started to work earlier this year, got more volunteers
on board and more work done.
-- People volunteered on the tails-l10n mailing-list to translate our website into
+- People volunteered on the tails-l10n mailing list to translate our website into
Italian, Spanish, Turkish, and Portuguese (Portugal).
Infrastructure
==============
-- The mailing-list for early testers, tails-testers@boum.org, was
+- The mailing list for early testers, tails-testers@boum.org, was
[[announced|news/tails-testers]] and already joined by 35 people.
- We are ready to welcome new contributors to [[improve the infrastructure behind
diff --git a/wiki/src/news/summit_2013.de.po b/wiki/src/news/summit_2013.de.po
index 42bab59..decc40e 100644
--- a/wiki/src/news/summit_2013.de.po
+++ b/wiki/src/news/summit_2013.de.po
@@ -69,8 +69,8 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
-"Our mailing-lists see quite a lot of traffic these days. This might deter "
-"people from reading it. So, we will create two specialized mailing-lists: a "
+"Our mailing lists see quite a lot of traffic these days. This might deter "
+"people from reading it. So, we will create two specialized mailing lists: a "
"private, encrypted one will receive bug reports, while a public one will be "
"dedicated to user support."
msgstr ""
@@ -89,7 +89,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"Still, the tails-dev mailing-list remains the main communication channel for "
+"Still, the tails-dev mailing list remains the main communication channel for "
"development and project-wide discussions."
msgstr ""
diff --git a/wiki/src/news/summit_2013.fa.po b/wiki/src/news/summit_2013.fa.po
index c22a45b..491d5cc 100644
--- a/wiki/src/news/summit_2013.fa.po
+++ b/wiki/src/news/summit_2013.fa.po
@@ -92,8 +92,8 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
-"Our mailing-lists see quite a lot of traffic these days. This might deter "
-"people from reading it. So, we will create two specialized mailing-lists: a "
+"Our mailing lists see quite a lot of traffic these days. This might deter "
+"people from reading it. So, we will create two specialized mailing lists: a "
"private, encrypted one will receive bug reports, while a public one will be "
"dedicated to user support."
msgstr ""
@@ -120,7 +120,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"Still, the tails-dev mailing-list remains the main communication channel for "
+"Still, the tails-dev mailing list remains the main communication channel for "
"development and project-wide discussions."
msgstr ""
"با این حال فهرست رایانامهٔ tails-dev کانال اصلی ارتباط ما برای بحث در مورد "
diff --git a/wiki/src/news/summit_2013.fr.po b/wiki/src/news/summit_2013.fr.po
index 90df620..4031d3a 100644
--- a/wiki/src/news/summit_2013.fr.po
+++ b/wiki/src/news/summit_2013.fr.po
@@ -93,8 +93,8 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
-"Our mailing-lists see quite a lot of traffic these days. This might deter "
-"people from reading it. So, we will create two specialized mailing-lists: a "
+"Our mailing lists see quite a lot of traffic these days. This might deter "
+"people from reading it. So, we will create two specialized mailing lists: a "
"private, encrypted one will receive bug reports, while a public one will be "
"dedicated to user support."
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"Still, the tails-dev mailing-list remains the main communication channel for "
+"Still, the tails-dev mailing list remains the main communication channel for "
"development and project-wide discussions."
msgstr ""
"Cela dit, la liste mail tails-dev reste le canal de communication principal "
diff --git a/wiki/src/news/summit_2013.mdwn b/wiki/src/news/summit_2013.mdwn
index f62f177..182f08c 100644
--- a/wiki/src/news/summit_2013.mdwn
+++ b/wiki/src/news/summit_2013.mdwn
@@ -29,16 +29,16 @@ We also **redesigned our communication channels** to ease involvement
of new contributors, to make more workload sharing possible, and to be
able to provide better user support. In short:
- * Our mailing-lists see quite a lot of traffic these days.
+ * Our mailing lists see quite a lot of traffic these days.
This might deter people from reading it. So, we will create two
- specialized mailing-lists: a private, encrypted one will receive
+ specialized mailing lists: a private, encrypted one will receive
bug reports, while a public one will be dedicated to user support.
* A growing FAQ will be assembled: it will be a tool for
self-service help, and should make support work less repetitive.
* In a few months, we will evaluate how all this fares and we will
reconsider web support, which is postponed for the moment.
-Still, the tails-dev mailing-list remains the main communication
+Still, the tails-dev mailing list remains the main communication
channel for development and project-wide discussions.
This summit gave us the chance to **evaluate and refine processes**
diff --git a/wiki/src/news/summit_2013.pt.po b/wiki/src/news/summit_2013.pt.po
index 42bab59..decc40e 100644
--- a/wiki/src/news/summit_2013.pt.po
+++ b/wiki/src/news/summit_2013.pt.po
@@ -69,8 +69,8 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
-"Our mailing-lists see quite a lot of traffic these days. This might deter "
-"people from reading it. So, we will create two specialized mailing-lists: a "
+"Our mailing lists see quite a lot of traffic these days. This might deter "
+"people from reading it. So, we will create two specialized mailing lists: a "
"private, encrypted one will receive bug reports, while a public one will be "
"dedicated to user support."
msgstr ""
@@ -89,7 +89,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"Still, the tails-dev mailing-list remains the main communication channel for "
+"Still, the tails-dev mailing list remains the main communication channel for "
"development and project-wide discussions."
msgstr ""
diff --git a/wiki/src/tags/announce.mdwn b/wiki/src/tags/announce.mdwn
index 7faeaf5..c694f0e 100644
--- a/wiki/src/tags/announce.mdwn
+++ b/wiki/src/tags/announce.mdwn
@@ -1,2 +1,2 @@
[[News]] that is published on the website and which should also be sent to the
-news mailing-list must be tagged with `announce`.
+news mailing list must be tagged with `announce`.