From e4285b1a2a2f737b88a7b43d6432d9fb7e06b950 Mon Sep 17 00:00:00 2001 From: Robert Mayr Date: Jun 28 2016 11:11:28 +0000 Subject: Merge branch 'master' of ssh://pagure.io/fedora-websites --- diff --git a/getfedora.org/data/content/cloud/download/docker.html b/getfedora.org/data/content/cloud/download/docker.html index c730a5b..310ffa6 100644 --- a/getfedora.org/data/content/cloud/download/docker.html +++ b/getfedora.org/data/content/cloud/download/docker.html @@ -80,7 +80,7 @@ 
docker load -i Fedora-Docker-Base-${global_variables.release['curr_id']}-${global_variables.release['RC_build']}.x86_64.tar.xz

${_('Following command can be used to spawn a container running bash inside:')}

docker run -it --rm Fedora-Docker-Base-${global_variables.release['curr_id']}-${global_variables.release['RC_build']}.x86_64 bash
- ${_('Download')} + ${_('Download')}

${_('64-bit %sMB raw.xz Image') % global_variables.iso_size['x86_64_docker']}

diff --git a/labs.fedoraproject.org/data/content/astronomy/download/index.html b/labs.fedoraproject.org/data/content/astronomy/download/index.html index ba47d7f..1d10431 100644 --- a/labs.fedoraproject.org/data/content/astronomy/download/index.html +++ b/labs.fedoraproject.org/data/content/astronomy/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s Astronomy')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s MB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Astronomy']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${_('Older Releases')}

diff --git a/labs.fedoraproject.org/data/content/design-suite/download/index.html b/labs.fedoraproject.org/data/content/design-suite/download/index.html index 636df43..4d96a80 100644 --- a/labs.fedoraproject.org/data/content/design-suite/download/index.html +++ b/labs.fedoraproject.org/data/content/design-suite/download/index.html @@ -18,7 +18,7 @@

${Markup(_('Download Fedora %(rel)s Design Suite')) % {'rel':global_variables.release['curr_id']}}

- +

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Design']}
@@ -47,7 +47,7 @@

${_('Direct Downloads')}

diff --git a/labs.fedoraproject.org/data/content/games/download/index.html b/labs.fedoraproject.org/data/content/games/download/index.html index 8ee6745..9892895 100644 --- a/labs.fedoraproject.org/data/content/games/download/index.html +++ b/labs.fedoraproject.org/data/content/games/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s Games')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Games']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${_('Older Releases')}

diff --git a/labs.fedoraproject.org/data/content/index.html b/labs.fedoraproject.org/data/content/index.html index 7490e78..94e01ab 100644 --- a/labs.fedoraproject.org/data/content/index.html +++ b/labs.fedoraproject.org/data/content/index.html @@ -35,8 +35,8 @@
Games banner
Games Screenshot -

${_('Unleash your inner musician.')}

 - ${_('For audio enthusiasts and musicians who want to create, edit and produce audio and music on Linux.')}
+

${_('Play with Fedora Today!')}

 + ${_('A collection and perfect show-case of the best games available in Fedora.')}
Robotics banner
diff --git a/labs.fedoraproject.org/data/content/jam/download/index.html b/labs.fedoraproject.org/data/content/jam/download/index.html index d7ab761..ce5fbb5 100644 --- a/labs.fedoraproject.org/data/content/jam/download/index.html +++ b/labs.fedoraproject.org/data/content/jam/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s Jam')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Jam']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${_('Older Releases')}

diff --git a/labs.fedoraproject.org/data/content/robotics/download/index.html b/labs.fedoraproject.org/data/content/robotics/download/index.html index c40698e..ed4cf36 100644 --- a/labs.fedoraproject.org/data/content/robotics/download/index.html +++ b/labs.fedoraproject.org/data/content/robotics/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s Robotics Suite')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Robotics']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${_('Older Releases')}

diff --git a/labs.fedoraproject.org/data/content/scientific/download/index.html b/labs.fedoraproject.org/data/content/scientific/download/index.html index 6c3cd42..4d47044 100644 --- a/labs.fedoraproject.org/data/content/scientific/download/index.html +++ b/labs.fedoraproject.org/data/content/scientific/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s Scientific')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Sci-kde']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${_('Older Releases')}

diff --git a/labs.fedoraproject.org/data/content/security/download/index.html b/labs.fedoraproject.org/data/content/security/download/index.html index 6cb55e6..bb12a2d 100644 --- a/labs.fedoraproject.org/data/content/security/download/index.html +++ b/labs.fedoraproject.org/data/content/security/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s Security Lab')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Security']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${_('Older Releases')}

diff --git a/spins.fedoraproject.org/data/content/cinnamon/download/index.html b/spins.fedoraproject.org/data/content/cinnamon/download/index.html index 406e8e4..6b02e55 100644 --- a/spins.fedoraproject.org/data/content/cinnamon/download/index.html +++ b/spins.fedoraproject.org/data/content/cinnamon/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s Cinnamon Desktop')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Cinnamon']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${Markup(_('ARM<span class="sup">®</span> Technology'))}

diff --git a/spins.fedoraproject.org/data/content/kde/download/index.html b/spins.fedoraproject.org/data/content/kde/download/index.html index 6f513b4..0447bfc 100644 --- a/spins.fedoraproject.org/data/content/kde/download/index.html +++ b/spins.fedoraproject.org/data/content/kde/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s KDE Plasma Desktop')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_KDE']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${Markup(_('ARM<span class="sup">®</span> Technology'))}

diff --git a/spins.fedoraproject.org/data/content/lxde/download/index.html b/spins.fedoraproject.org/data/content/lxde/download/index.html index 251ad17..485e85a 100644 --- a/spins.fedoraproject.org/data/content/lxde/download/index.html +++ b/spins.fedoraproject.org/data/content/lxde/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s LXDE Desktop')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s MB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_LXDE']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${Markup(_('ARM<span class="sup">®</span> Technology'))}

diff --git a/spins.fedoraproject.org/data/content/mate-compiz/download/index.html b/spins.fedoraproject.org/data/content/mate-compiz/download/index.html index b710a6e..b99f80f 100644 --- a/spins.fedoraproject.org/data/content/mate-compiz/download/index.html +++ b/spins.fedoraproject.org/data/content/mate-compiz/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s MATE-Compiz Desktop')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Mate']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${Markup(_('ARM<span class="sup">®</span> Technology'))}

diff --git a/spins.fedoraproject.org/data/content/xfce/download/index.html b/spins.fedoraproject.org/data/content/xfce/download/index.html index 1d5aeff..2d74ad0 100644 --- a/spins.fedoraproject.org/data/content/xfce/download/index.html +++ b/spins.fedoraproject.org/data/content/xfce/download/index.html @@ -17,7 +17,7 @@

${Markup(_('Download Fedora %(rel)s Xfce Desktop')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('%s MB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Xfce']}
@@ -35,7 +35,7 @@

${_('Direct Downloads')}

${Markup(_('ARM<span class="sup">®</span> Technology'))}