Skip to content
GitLab
Commit 5910a33e authored by sajolida's avatar sajolida
Browse files

Merge branch 'web/10622-improve-verify' (Closes: #10622) 

Conflicts:
	wiki/src/inc/stable_i386_date.fr.po
parents c218d9ec 8ec7a3e2
Hide whitespace changes
Inline Side-by-side
ikiwiki-cgi.setup
View file @ 5910a33e
......@@ -225,7 +225,7 @@ po_slave_languages:
- fr|Français
- pt|Português
# PageSpec controlling which pages are translatable
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_date or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
......
ikiwiki.setup
View file @ 5910a33e
......@@ -202,7 +202,7 @@ po_slave_languages:
- fr|Français
- pt|Português
# PageSpec controlling which pages are translatable
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_date or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
......
wiki/src/contribute/release_process.mdwn
View file @ 5910a33e
......@@ -306,10 +306,10 @@ at least 24 hours in the future! Between tests and mirror synchronization,
the build will not be released on the same day. Try to make sure it
matches the date of the future signature.
RELEASE_DATE='June 26, 2013'
RELEASE_DATE='2015-11-03'
echo "$VERSION" > wiki/src/inc/stable_i386_version.html
echo "$RELEASE_DATE" > wiki/src/inc/stable_i386_date.html
echo -n "$RELEASE_DATE" > wiki/src/inc/stable_i386_date.html
sed -ri "s%news/version_.*]]%news/version_$VERSION]]%" wiki/src/inc/stable_i386_release_notes.*
$EDITOR wiki/src/inc/*.html
./build-website
......
wiki/src/inc/stable_i386_date.de.po deleted 100644 → 0
View file @ c218d9ec
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-18 20:16+0100\n"
"PO-Revision-Date: 2012-11-25 14:23+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: outside any tag (error?)
msgid "December 19, 2015"
msgstr ""
wiki/src/inc/stable_i386_date.fr.po deleted 100644 → 0
View file @ c218d9ec
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2015-12-18 20:16+0100\n"
"PO-Revision-Date: 2015-11-10 22:42+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
msgid "December 19, 2015"
msgstr "19 décembre 2015"
#~ msgid "August 28, 2015"
#~ msgstr "28 août 2015"
#~ msgid "July 3, 2015"
#~ msgstr "3 juillet 2015"
wiki/src/inc/stable_i386_date.pt.po deleted 100644 → 0
View file @ c218d9ec
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-18 20:16+0100\n"
"PO-Revision-Date: 2014-07-30 18:11-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: outside any tag (error?)
msgid "December 19, 2015"
msgstr ""
#, fuzzy
#~| msgid "July 22, 2014"
#~ msgid "July 3, 2015"
#~ msgstr "22 de julho de 2014"
wiki/src/install/inc/steps/verify_up-to-date.inline.mdwn
View file @ 5910a33e
......@@ -16,18 +16,18 @@ from is up-to-date:
1. Verify that you are running
<span class="guilabel">Tails [[!inline pages="inc/stable_i386_version" raw="yes"]]</span>
which is the latest version.
released on [[!inline pages="inc/stable_i386_date" raw="yes"]]:
1. If you are not running the latest version, connect to the Internet
and wait until Tor is ready. After a minute or two, <span class="application">Tails Upgrader</span>
appears with instructions on how to upgrade.
a. If you are running [[!inline pages="inc/stable_i386_version" raw="yes"]] then you can continue with the next step.
Apply all upgrades as requested.
b. If you are not running [[!inline pages="inc/stable_i386_version" raw="yes"]] then connect to the Internet
and wait until Tor is ready. After a minute or two, <span class="application">Tails Upgrader</span>
appears with instructions on how to upgrade. Apply all upgrades as requested.
<div class="bug">
<p>If at some point it is impossible to automatically upgrade, then
we recommend you
<span class="install-clone">[[choose a different installation method|install/os]].</span>
<span class="mac-clone">[[choose a different installation method|install/mac]].</span>
<span class="upgrade-clone">[[upgrade from Tails instead|upgrade/tails]].</span>
</div>
<div class="bug">
<p>If at some point it is impossible to do automatic upgrades, then
we recommend you
<span class="install-clone">[[choose a different installation method|install/os]].</span>
<span class="mac-clone">[[choose a different installation method|install/mac]].</span>
<span class="upgrade-clone">[[upgrade from Tails instead|upgrade/tails]].</span>
</div>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment