#1082 [stg] Fetch weblate translations for all websites
Merged 2 years ago by bcotton. Opened 2 years ago by darknao.
darknao/fedora-websites l10n_stg  into  staging

Merge branch 'master' into f34
Rick Elrod • 3 years ago  
[labs] checksum fixes
Rick Elrod • 3 years ago  
[spins] checksum fixes
Rick Elrod • 3 years ago  
Nix two missing arm spins
Rick Elrod • 3 years ago  
[arm] checksum fixes
Rick Elrod • 3 years ago  
bump globalvar
Rick Elrod • 3 years ago  
file modified
+5 -2
@@ -27,7 +27,7 @@ 

  		fi   \

  	fi

  

- all:: $(LANGUAGES)

+ all:: en $(LANGUAGES)

  	cp static/robots.txt out/

  

  static:
@@ -44,6 +44,9 @@ 

  for me to get its name.. Please use a wise name."

  endif

  

+ po/en.po: pot

+ 	msginit -i $(POT_FILE) --no-translator -l en -o po/en.po

+ 

  data/templates/translations.html: po/LINGUAS

  	$(PYTHON) $(BUILDDIR)/construct-translations.py $(BUILDDIR)/translations.ini $^ $@

  
@@ -59,7 +62,7 @@ 

  	rm -rf $(TRANS_TMP)

  

  pullpos:

- 	git clone ssh://git@pagure.io/fedora-web/translations.git $(TRANS_TMP)

+ 	git clone https://pagure.io/fedora-web/translations.git $(TRANS_TMP)

  	cp -R $(TRANS_TMP)/$(TRANS_FOLDER)/*.po ./po/

  	cp -R $(TRANS_TMP)/$(TRANS_FOLDER)/LINGUAS ./po/

  	rm -rf $(TRANS_TMP)

file modified
+1 -1
@@ -47,7 +47,7 @@ 

  

  #### 1. Setup your system

  

-     sudo dnf install git gettext python-genshi python-lxml python-setuptools python-dateutil \

+     sudo dnf install git gettext python2-genshi python-lxml python-setuptools python-dateutil \

      python-dogpile-cache babel python-feedparser fedfind python-requests python2-babel

  

      sudo dnf groups install 'Web Server'

@@ -1,5 +1,5 @@ 

  include ../Makefile.in

  

- $(LANGUAGES): % : | static po/%.mo data/templates/translations.html

+ en $(LANGUAGES): % : | static po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

@@ -43,7 +43,7 @@ 

              <p>${Markup(_('%sGB dvd iso')) % global_variables.iso_size['aarch64_Server_DVD']}</p>

              </div>

              <div class="col-md-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

              </div>

            </div>

            <div class="white">
@@ -57,7 +57,7 @@ 

              <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_Server_net']}</p>

              </div>

              <div class="col-md-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

              </div>

            </div>

            <div class="white">
@@ -71,7 +71,35 @@ 

              <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['aarch64_WS']}</p>

              </div>

              <div class="col-md-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Workstation/aarch64/images/Fedora-Workstation-${global_variables.release['curr_alt_id']}-1.3.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Workstation/aarch64/images/Fedora-Workstation-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+             </div>

+           </div>

+           <div class="white">

+             <div class="col-md-1">

+             <img src="/static/images/kde.png" />

+             </div>

+             <div class="col-md-4">

+             <h3>${_('Fedora KDE Plasma')}</h3>

+             </div>

+             <div class="col-md-3">

+             <p>${Markup(_('%sGB Live ISO')) % global_variables.iso_size['aarch64_KDE_live']}</p>

+             </div>

+             <div class="col-md-4">

+             <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Spins/aarch64/iso/Fedora-KDE-Live-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+             </div>

+           </div>

+             <div class="white">

+             <div class="col-md-1">

+             <img src="/static/images/kde.png" />

+             </div>

+             <div class="col-md-4">

+             <h3>${_('Fedora KDE Plasma')}</h3>

+             </div>

+             <div class="col-md-3">

+             <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['aarch64_KDE_raw']}</p>

+             </div>

+             <div class="col-md-4">

+             <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Spins/aarch64/images/Fedora-KDE-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

              </div>

            </div>

            <div class="white">
@@ -85,7 +113,7 @@ 

              <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['aarch64_min']}</p>

              </div>

              <div class="col-md-4">

-             <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Spins/aarch64/images/Fedora-Minimal-${global_variables.release['curr_alt_id']}-1.3.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+             <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Spins/aarch64/images/Fedora-Minimal-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

              </div>

            </div>

            <div class="white">
@@ -99,7 +127,7 @@ 

              <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_ev']}</p>

              </div>

              <div class="col-md-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Everything/aarch64/iso/Fedora-Everything-netinst-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Everything-${global_variables.release['curr_id']}-1.3-aarch64-CHECKSUM">${_('Verify')}</a></p>

+             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Everything/aarch64/iso/Fedora-Everything-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-aarch64-CHECKSUM">${_('Verify')}</a></p>

              </div>

            </div>

  <!--          <div class="white">
@@ -113,7 +141,7 @@ 

              <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_Cloud_net']}</p>

              </div>

              <div class="col-md-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

              </div>

            </div> -->

            <div class="white">
@@ -183,7 +211,7 @@ 

            </div>

            <div class="col-xs-9">

            <h3>${_('Fedora Server')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div>

          <div class="white">
@@ -192,7 +220,7 @@ 

            </div>

            <div class="col-xs-9">

            <h3>${_('Fedora Server')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div>

          <div class="white">
@@ -201,7 +229,7 @@ 

            </div>

            <div class="col-xs-9">

            <h3>${_('Fedora Workstation')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Workstation/aarch64/images/Fedora-Workstation-${global_variables.release['curr_alt_id']}-1.3.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Workstation/aarch64/images/Fedora-Workstation-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div>

          <div class="white">
@@ -210,7 +238,7 @@ 

            </div>

            <div class="col-xs-9">

            <h3>${_('Fedora Minimal')}</h3>

-           <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Spins/aarch64/images/Fedora-Minimal-${global_variables.release['curr_alt_id']}-1.3.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Spins/aarch64/images/Fedora-Minimal-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div>

          <div class="white">
@@ -219,7 +247,7 @@ 

            </div>

            <div class="col-xs-9">

            <h3>${_('Everything')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Everything/aarch64/iso/Fedora-Everything-netinst-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-aarch64-CHECKSUM">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Everything/aarch64/iso/Fedora-Everything-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-aarch64-CHECKSUM">${_('Verify')}</a></p>

            </div>

          </div>

  <!--        <div class="white">
@@ -228,7 +256,7 @@ 

            </div>

            <div class="col-xs-9">

            <h3>${_('Fedora Cloud')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div> -->

          <div class="white">
@@ -284,7 +312,7 @@ 

            <h3>${_('Fedora Server')}</h3>

            </div>

            <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div>

           <div class="white">
@@ -295,7 +323,7 @@ 

            <h3>${_('Fedora Server')}</h3>

            </div>

            <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div>

          <div class="white">
@@ -306,7 +334,7 @@ 

            <h3>${_('Fedora Workstation')}</h3>

            </div>

            <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Workstation/aarch64/images/Fedora-Workstation-${global_variables.release['curr_alt_id']}-1.3.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Workstation/aarch64/images/Fedora-Workstation-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div>

          <div class="white">
@@ -317,7 +345,7 @@ 

            <h3>${_('Fedora Minimal')}</h3>

            </div>

            <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Spins/aarch64/images/Fedora-Minimal-${global_variables.release['curr_alt_id']}-1.3.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Spins/aarch64/images/Fedora-Minimal-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div>

          <div class="white">
@@ -328,7 +356,7 @@ 

            <h3>${_('Everything')}</h3>

            </div>

            <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Everything/aarch64/iso/Fedora-Everything-netinst-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-aarch64-CHECKSUM">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Everything/aarch64/iso/Fedora-Everything-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-aarch64-CHECKSUM">${_('Verify')}</a></p>

            </div>

          </div>

  <!--        <div class="white">
@@ -339,7 +367,7 @@ 

            <h3>${_('Fedora Cloud')}</h3>

            </div>

            <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-1.3.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

+           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>

            </div>

          </div> -->

          <div class="white">

@@ -38,7 +38,8 @@ 

              </div>

              <h4 class="uppercase">${_('Workstation')}</h4>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Workstation-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/iso/Fedora-Workstation-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64 iso')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Workstation-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64 images')}</a>

              </div>

          </div>

          <div class="col-sm-3 col-xs-12 highlight productitem">
@@ -47,16 +48,17 @@ 

              </div>

              <h4 class="uppercase">${_('Server')}</h4>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Spins-${global_variables.release['curr_alt_id']}-1.3-aarch64-CHECKSUM">${_('aarch64 Minimal')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Spins-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('aarch64 Minimal')}</a>

              </div>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Server-${global_variables.release['curr_alt_id']}-1.3-aarch64-CHECKSUM">${_('For aarch64')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/iso/Fedora-Server-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64 iso')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Server-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64 images')}</a>

              </div>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Server-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}-ppc64le-CHECKSUM">${_('For ppc64le')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/iso/Fedora-Server-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}-ppc64le-CHECKSUM">${_('For ppc64le')}</a>

              </div>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Server-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}-s390x-CHECKSUM">${_('For s390x')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/iso/Fedora-Server-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}-s390x-CHECKSUM">${_('For s390x')}</a>

              </div>

          </div>

          <div class="col-sm-3 col-xs-12 highlight productitem">
@@ -65,19 +67,16 @@ 

              </div>

              <h4 class="uppercase">${_('Cloud')}</h4>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Cloud-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64 iso')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Cloud-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64 images')}</a>

              </div>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Cloud-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64 images')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Cloud-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64le']}-ppc64le-CHECKSUM">${_('For ppc64le images')}</a>

              </div>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Cloud-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64le']}-ppc64le-CHECKSUM">${_('For ppc64le images')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Cloud-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}-s390x-CHECKSUM">${_('For s390x images')}</a>

              </div>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Cloud-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}-s390x-CHECKSUM">${_('For s390x images')}</a>

-             </div>

-             <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Cloud-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('For Cloud Base images')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Cloud-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('For x86_64 images')}</a>

              </div>

          </div>

          <div class="col-sm-3 col-xs-12 highlight productitem cloud">
@@ -86,13 +85,13 @@ 

              </div>

              <h4 class="uppercase">${_('Container')}</h4>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Container-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Container-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}-aarch64-CHECKSUM">${_('For aarch64')}</a>

              </div>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Container-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64le']}-ppc64le-CHECKSUM">${_('For ppc64le')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Container-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64le']}-ppc64le-CHECKSUM">${_('For ppc64le')}</a>

              </div>

              <div class="h-body text-center">

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/Fedora-Container-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}-s390x-CHECKSUM">${_('For s390x')}</a>

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Container-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}-s390x-CHECKSUM">${_('For s390x')}</a>

              </div>

          </div>

      </div>
@@ -106,9 +105,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

              <p>${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}</p>

              <ul>

+                 <li><code>45719A39</code> - ${_('Fedora 34')}</li>

+                 <li><code>9570FF31</code> - ${_('Fedora 33')}</li>

                  <li><code>12C944D0</code> - ${_('Fedora 32')}</li>

-                 <li><code>3C3359C4</code> - ${_('Fedora 31')}</li>

-                 <li><code>CFC659B9</code> - ${_('Fedora 30')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

              <p>${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}</p>

@@ -7,13 +7,4 @@ 

  

  	<h3>${Markup(_('Verify your Download!'))}</h3>

      	<p>${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow &lt;a href="../../%s/verify"&gt;these instructions&lt;/a&gt;.') % (lang))}</p>

-           <div class="row bottom-margin">

-             <div class="col-sm-4 col-xs-12">

-               <a class="btn btn-default btn-topmargin" href="https://getfedora.org/static/checksums/Fedora-Live-x86_64-${global_variables.release['curr_id']}-CHECKSUM">${_('Verify 64bit!')}</a>

-             </div>

-             <div class="col-sm-4 col-xs-12">

-               <a class="btn btn-default btn-topmargin" href="https://getfedora.org/static/checksums/Fedora-Live-i386-${global_variables.release['curr_id']}-CHECKSUM">${_('Verify 32bit!')}</a>

-             </div>

-           </div>

- 

  </html>

empty or binary file added
@@ -1,5 +1,5 @@ 

  include ../Makefile.in

  

- $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

+ en $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

@@ -1,598 +1,610 @@ 

  <!DOCTYPE html>

  <html lang="${lang}"

-   xmlns="http://www.w3.org/1999/xhtml"

-   xmlns:py="http://genshi.edgewall.org/"

-   xmlns:xi="http://www.w3.org/2001/XInclude">

+       xmlns="http://www.w3.org/1999/xhtml"

+       xmlns:py="http://genshi.edgewall.org/"

+       xmlns:xi="http://www.w3.org/2001/XInclude">

    <xi:include href="../templates/master.html" />

    <head>

      <title>${_('Fedora ARM')}</title>

    </head>

  

- <body class="home">

- <xi:include href="../templates/head.html" />

+   <body class="home">

+     <xi:include href="../templates/head.html" />

  

-   <!-- News -->

-   <py:choose>

-     <py:when test="global_variables.release['curr_state'] == 'Alpha'">

-       <div class="newsbox">

-         <div class="container">

-           <div class="row">

-             <div class="col-xs-12 text-center index">

-               <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>

+     <!-- News -->

+     <py:choose>

+       <py:when test="global_variables.release['curr_state'] == 'Alpha'">

+         <div class="newsbox">

+           <div class="container">

+             <div class="row">

+               <div class="col-xs-12 text-center index">

+                 <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>

+               </div>

              </div>

            </div>

          </div>

-       </div>

-     </py:when>

-     <py:when test="global_variables.release['curr_state'] == 'Beta'">

-       <div class="jumbotron newsbox">

-         <div class="container">

-           <div class="row">

-             <div class="col-xs-12 text-center index">

-               <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>

+       </py:when>

+       <py:when test="global_variables.release['curr_state'] == 'Beta'">

+         <div class="jumbotron newsbox">

+           <div class="container">

+             <div class="row">

+               <div class="col-xs-12 text-center index">

+                 <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>

+               </div>

              </div>

            </div>

          </div>

-       </div>

-     </py:when>

-     <py:otherwise>

-       <div class="jumbotron newsbox">

-         <div class="container">

-           <div class="row">

-             <div class="col-xs-12 text-center index">

-               <h3>${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}</h3>

+       </py:when>

+       <py:otherwise>

+         <div class="jumbotron newsbox">

+           <div class="container">

+             <div class="row">

+               <div class="col-xs-12 text-center index">

+                 <h3>${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}</h3>

+               </div>

              </div>

            </div>

          </div>

-       </div>

-     </py:otherwise>

-   </py:choose>

+       </py:otherwise>

+     </py:choose>

  

-   <!-- Servers -->

-   <div class="jumbotron main-head hidden-xs hidden-sm">

-     <div class="container using">

-       <div class="row">

-         <div class="col-xs-12">

-         <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Servers'))}</h2>

+     <!-- Servers -->

+     <div class="jumbotron main-head hidden-xs hidden-sm">

+       <div class="container using">

+         <div class="row">

+           <div class="col-xs-12">

+             <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Servers'))}</h2>

+           </div>

+         </div>

+         <div class="row">

+           <div class="col-md-3 product-feature">

+             <p>${_('These images are geared towards ARM-based computers used as servers, typically in a headless environment.')}</p>

+           </div>

+           <div class="col-md-9">

+             <div class="white">

+               <div class="col-md-1">

+                 <img src="/static/images/server.png" />

+               </div>

+               <div class="col-md-4">

+                 <h3>${_('Fedora Server')}</h3>

+               </div>

+               <div class="col-md-3">

+                 <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ARM_Server']}</p>

+               </div>

+               <div class="col-md-4">

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/armhfp/images/Fedora-Server-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+             </div>

+             <div class="white">

+               <div class="col-md-1">

+                 <img src="/static/images/minimal.png" />

+               </div>

+               <div class="col-md-4">

+                 <h3>${_('Fedora Minimal')}</h3>

+               </div>

+               <div class="col-md-3">

+                 <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ARM_Minimal']}</p>

+               </div>

+               <div class="col-md-4">

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Minimal-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+             </div>

+           </div>

          </div>

        </div>

-       <div class="row">

-         <div class="col-md-3 product-feature">

-         <p>${_('These images are geared towards ARM-based computers used as servers, typically in a headless environment.')}</p>

+     </div>

+ 

+     <!-- Servers mobile phones-->

+     <div class="jumbotron main-head visible-xs">

+       <div class="container using">

+         <div class="row">

+           <div class="col-xs-12">

+             <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Servers'))}</h2>

+           </div>

+         </div>

+         <div class="row">

+           <div class="col-xs-12 product-feature">

+             <p>${_('These images are geared towards ARM-based computers used as servers, typically in a headless environment.')}</p>

+           </div>

          </div>

-         <div class="col-md-9">

+         <div class="row">

            <div class="white">

-             <div class="col-md-1">

-             <img src="/static/images/server.png" />

-             </div>

-             <div class="col-md-4">

-             <h3>${_('Fedora Server')}</h3>

-             </div>

-             <div class="col-md-3">

-             <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ARM_Server']}</p>

+             <div class="col-xs-3">

+               <img src="/static/images/server.png" />

              </div>

-             <div class="col-md-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/armhfp/images/Fedora-Server-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             <div class="col-xs-9">

+               <h3>${_('Fedora Server')}</h3>

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/armhfp/images/Fedora-Server-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

            </div>

            <div class="white">

-             <div class="col-md-1">

-             <img src="/static/images/minimal.png" />

-             </div>

-             <div class="col-md-4">

-             <h3>${_('Fedora Minimal')}</h3>

-             </div>

-             <div class="col-md-3">

-             <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ARM_Minimal']}</p>

+             <div class="col-xs-3">

+               <img src="/static/images/minimal.png" />

              </div>

-             <div class="col-md-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Minimal-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             <div class="col-xs-9">

+               <h3>${_('Fedora Minimal')}</h3>

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Minimal-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

            </div>

          </div>

        </div>

      </div>

-   </div>

  

-   <!-- Servers mobile phones-->

-   <div class="jumbotron main-head visible-xs">

-     <div class="container using">

-       <div class="row">

-         <div class="col-xs-12">

-         <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Servers'))}</h2>

-         </div>

-       </div>

-       <div class="row">

-         <div class="col-xs-12 product-feature">

-         <p>${_('These images are geared towards ARM-based computers used as servers, typically in a headless environment.')}</p>

-         </div>

-       </div>

-       <div class="row">

-         <div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/server.png" />

+     <!-- Servers mobile tablets-->

+     <div class="jumbotron main-head visible-sm">

+       <div class="container using">

+         <div class="row">

+           <div class="col-xs-12">

+             <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Servers'))}</h2>

            </div>

-           <div class="col-xs-9">

-           <h3>${_('Fedora Server')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/armhfp/images/Fedora-Server-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+         </div>

+         <div class="row">

+           <div class="col-xs-12 product-feature">

+             <p>${_('These images are geared towards ARM-based computers used as servers, typically in a headless environment.')}</p>

            </div>

          </div>

-         <div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/minimal.png" />

+         <div class="row">

+           <div class="white">

+             <div class="col-sm-3">

+               <img src="/static/images/server.png" />

+             </div>

+             <div class="col-sm-5">

+               <h3>${_('Fedora Server')}</h3>

+             </div>

+             <div class="col-sm-4">

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/armhfp/images/Fedora-Server-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             </div>

            </div>

-           <div class="col-xs-9">

-           <h3>${_('Fedora Minimal')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Minimal-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+           <div class="white">

+             <div class="col-sm-3">

+               <img src="/static/images/minimal.png" />

+             </div>

+             <div class="col-sm-5">

+               <h3>${_('Fedora Minimal')}</h3>

+             </div>

+             <div class="col-sm-4">

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Minimal-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             </div>

            </div>

          </div>

        </div>

      </div>

-   </div>

  

-   <!-- Servers mobile tablets-->

-   <div class="jumbotron main-head visible-sm">

-     <div class="container using">

-       <div class="row">

-         <div class="col-xs-12">

-         <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Servers'))}</h2>

-         </div>

-       </div>

-       <div class="row">

-         <div class="col-xs-12 product-feature">

-         <p>${_('These images are geared towards ARM-based computers used as servers, typically in a headless environment.')}</p>

-         </div>

-       </div>

-       <div class="row">

-         <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/server.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('Fedora Server')}</h3>

-           </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/armhfp/images/Fedora-Server-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

-         </div>

-         <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/minimal.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('Fedora Minimal')}</h3>

-           </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Minimal-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+     <!-- Desktops -->

+     <div class="jumbotron main-head top-space desktop visible-lg hidden-xs hidden-sm hidden-md">

+       <div class="container using">

+         <div class="row">

+           <div class="col-xs-12">

+             <h2>${_('Desktop Computing')}</h2>

+           </div>

+         </div>

+         <div class="row">

+           <div class="col-lg-3 product-feature">

+             <p>${_('These images are for ARM-based mediacenters, kiosks, laptops, and other ARM-powered devices where a graphical interface is desired.')}</p>

+           </div>

+           <div class="col-lg-9">

+             <div class="white">

+               <div class="col-lg-1">

+                 <img src="/static/images/workstation.png" />

+               </div>

+               <div class="col-lg-4">

+                 <h3>${_('Fedora Workstation')}</h3>

+               </div>

+               <div class="col-lg-3">

+                 <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Workstation']}</p>

+               </div>

+               <div class="col-lg-4">

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/armhfp/images/Fedora-Workstation-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+ 	    </div>

+             <div class="white">

+               <div class="col-lg-1">

+                 <img src="/static/images/kde.png" />

+               </div>

+               <div class="col-lg-4">

+                 <h3>${_('KDE Plasma Desktop')}</h3>

+               </div>

+               <div class="col-lg-3">

+                 <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_KDE']}</p>

+               </div>

+               <div class="col-lg-4">

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-KDE-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+             </div>

+             <div class="white">

+               <div class="col-lg-1">

+                 <img src="/static/images/xfce.png" />

+               </div>

+               <div class="col-lg-4">

+                 <h3>${_('Xfce Desktop')}</h3>

+               </div>

+               <div class="col-lg-3">

+                 <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Xfce']}</p>

+               </div>

+               <div class="col-lg-4">

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Xfce-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+             </div>

+             <!--          <div class="white">

+                           <div class="col-lg-1">

+                             <img src="/static/images/lxqt.png" />

+                           </div>

+                           <div class="col-lg-4">

+                             <h3>${_('LXQt Desktop')}</h3>

+                           </div>

+                           <div class="col-lg-3">

+                             <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_LXQt']}</p>

+                           </div>

+                           <div class="col-lg-4">

+                             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXQt-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+                           </div>

+             </div> -->

+             <!--

+             <div class="white">

+               <div class="col-lg-1">

+                 <img src="/static/images/lxde.png" />

+               </div>

+               <div class="col-lg-4">

+                 <h3>${_('LXDE Desktop')}</h3>

+               </div>

+               <div class="col-lg-3">

+                 <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_LXDE']}</p>

+               </div>

+               <div class="col-lg-4">

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXDE-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+             </div>

+             -->

+             <!--

+             <div class="white">

+               <div class="col-lg-1">

+                 <img src="/static/images/mate.png" />

+               </div>

+               <div class="col-lg-4">

+                 <h3>${_('MATE-Compiz Desktop')}</h3>

+               </div>

+               <div class="col-lg-3">

+                 <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Mate']}</p>

+               </div>

+               <div class="col-lg-4">

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Mate-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+             </div>

+             -->

+             <div class="white">

+               <div class="col-lg-1">

+                 <img src="/static/images/soas.png" />

+               </div>

+               <div class="col-lg-4">

+                 <h3>${_('Sugar on a Stick')}</h3>

+               </div>

+               <div class="col-lg-3">

+                 <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ARM_SoaS']}</p>

+               </div>

+               <div class="col-lg-4">

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-SoaS-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+             </div>

            </div>

          </div>

        </div>

      </div>

-   </div>

  

-   <!-- Desktops -->

-   <div class="jumbotron main-head top-space desktop visible-lg hidden-xs hidden-sm hidden-md">

-     <div class="container using">

-       <div class="row">

-         <div class="col-xs-12">

-         <h2>${_('Desktop Computing')}</h2>

-         </div>

-       </div>

-       <div class="row">

-         <div class="col-lg-3 product-feature">

-         <p>${_('These images are for ARM-based mediacenters, kiosks, laptops, and other ARM-powered devices where a graphical interface is desired.')}</p>

-         </div>

-         <div class="col-lg-9">

+     <!-- Desktops mobile phones-->

+     <div class="jumbotron main-head top-space desktop visible-xs">

+       <div class="container using">

+         <div class="row">

+           <div class="col-xs-12">

+             <h2>${_('Desktop Computing')}</h2>

+           </div>

+         </div>

+         <div class="row">

+           <div class="col-xs-12 product-feature">

+             <p>${_('These images are for ARM-based mediacenters, kiosks, laptops, and other ARM-powered devices where a graphical interface is desired.')}</p>

+           </div>

+         </div>

+         <div class="row">

+           <!--<div class="white">

+               <div class="col-xs-3">

+                 <img src="/static/images/workstation.png" />

+               </div>

+               <div class="col-xs-9">

+                 <h3>${_('Fedora Workstation')}</h3>

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/armhfp/images/Fedora-Workstation-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+ 	  </div>-->

            <div class="white">

-             <div class="col-lg-1">

-             <img src="/static/images/workstation.png" />

-             </div>

-             <div class="col-lg-4">

-             <h3>${_('Fedora Workstation')}</h3>

+             <div class="col-xs-3">

+               <img src="/static/images/kde.png" />

              </div>

-             <div class="col-lg-3">

-             <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Workstation']}</p>

+             <div class="col-xs-9">

+               <h3>${_('KDE Plasma Desktop')}</h3>

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-KDE-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

-             <div class="col-lg-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/armhfp/images/Fedora-Workstation-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-             </div>

- 	  </div>

+           </div>

            <div class="white">

-             <div class="col-lg-1">

-             <img src="/static/images/kde.png" />

-             </div>

-             <div class="col-lg-4">

-             <h3>${_('KDE Plasma Desktop')}</h3>

-             </div>

-             <div class="col-lg-3">

-             <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_KDE']}</p>

+             <div class="col-xs-3">

+               <img src="/static/images/xfce.png" />

+             </div>

+             <div class="col-xs-9">

+               <h3>${_('Xfce Desktop')}</h3>

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Xfce-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             </div>

+           </div>

+           <!--        <div class="white">

+                       <div class="col-xs-3">

+                         <img src="/static/images/lxqt.png" />

+                       </div>

+                       <div class="col-xs-9">

+                         <h3>${_('LXQt Desktop')}</h3>

+                         <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXQt-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+                       </div>

+           </div> -->

+           <!--

+           <div class="white">

+             <div class="col-xs-3">

+               <img src="/static/images/lxde.png" />

              </div>

-             <div class="col-lg-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-KDE-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             <div class="col-xs-9">

+               <h3>${_('LXDE Desktop')}</h3>

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXDE-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

            </div>

+           -->

+           <!--

            <div class="white">

-             <div class="col-lg-1">

-             <img src="/static/images/xfce.png" />

+             <div class="col-xs-3">

+               <img src="/static/images/mate.png" />

              </div>

-             <div class="col-lg-4">

-             <h3>${_('Xfce Desktop')}</h3>

+             <div class="col-xs-9">

+               <h3>${_('MATE-Compiz Desktop')}</h3>

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Mate-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

-             <div class="col-lg-3">

-             <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Xfce']}</p>

+           </div>

+           -->

+           <div class="white">

+             <div class="col-xs-3">

+               <img src="/static/images/soas.png" />

              </div>

-             <div class="col-lg-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Xfce-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             <div class="col-xs-9">

+               <h3>${_('Sugar on a Stick')}</h3>

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-SoaS-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

            </div>

- <!--          <div class="white">

-             <div class="col-lg-1">

-             <img src="/static/images/lxqt.png" />

-             </div>

-             <div class="col-lg-4">

-             <h3>${_('LXQt Desktop')}</h3>

+         </div>

+       </div>

+     </div>

+ 

+     <!-- Desktops mobile tablets-->

+     <div class="jumbotron main-head top-space desktop visible-sm-md hidden-xs hidden-lg">

+       <div class="container using">

+         <div class="row">

+           <div class="col-xs-12">

+             <h2>${_('Desktop Computing')}</h2>

+           </div>

+         </div>

+         <div class="row">

+           <div class="col-xs-12 product-feature">

+             <p>${_('These images are for ARM-based mediacenters, kiosks, laptops, and other ARM-powered devices where a graphical interface is desired.')}</p>

+           </div>

+         </div>

+         <div class="row">

+           <!--<div class="white">

+               <div class="col-sm-3">

+                 <img src="/static/images/workstation.png" />

+               </div>

+               <div class="col-sm-5">

+                 <h3>${_('Fedora Workstation')}</h3>

+               </div>

+               <div class="col-sm-4">

+                 <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/armhfp/images/Fedora-Workstation-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+ 	  </div>-->

+           <div class="white">

+             <div class="col-sm-3">

+               <img src="/static/images/kde.png" />

              </div>

-             <div class="col-lg-3">

-             <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_LXQt']}</p>

+             <div class="col-sm-5">

+               <h3>${_('KDE Plasma Desktop')}</h3>

              </div>

-             <div class="col-lg-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXQt-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             <div class="col-sm-4">

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-KDE-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

+           </div>

+           <div class="white">

+             <div class="col-sm-3">

+               <img src="/static/images/xfce.png" />

+             </div>

+             <div class="col-sm-5">

+               <h3>${_('Xfce Desktop')}</h3>

+             </div>

+             <div class="col-sm-4">

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Xfce-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             </div>

+           </div>

+           <!--        <div class="white">

+                       <div class="col-sm-3">

+                         <img src="/static/images/lxqt.png" />

+                       </div>

+                       <div class="col-sm-5">

+                         <h3>${_('LXQt Desktop')}</h3>

+                       </div>

+                       <div class="col-sm-4">

+                         <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXQt-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+                       </div>

            </div> -->

+           <!--

            <div class="white">

-             <div class="col-lg-1">

-             <img src="/static/images/lxde.png" />

-             </div>

-             <div class="col-lg-4">

-             <h3>${_('LXDE Desktop')}</h3>

+             <div class="col-sm-3">

+               <img src="/static/images/lxde.png" />

              </div>

-             <div class="col-lg-3">

-             <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_LXDE']}</p>

+             <div class="col-sm-5">

+               <h3>${_('LXDE Desktop')}</h3>

              </div>

-             <div class="col-lg-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXDE-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             <div class="col-sm-4">

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXDE-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

            </div>

+           -->

+           <!--

            <div class="white">

-             <div class="col-lg-1">

-             <img src="/static/images/mate.png" />

+             <div class="col-sm-3">

+               <img src="/static/images/mate.png" />

              </div>

-             <div class="col-lg-4">

-             <h3>${_('MATE-Compiz Desktop')}</h3>

+             <div class="col-sm-5">

+               <h3>${_('MATE-Compiz Desktop')}</h3>

              </div>

-             <div class="col-lg-3">

-             <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Mate']}</p>

-             </div>

-             <div class="col-lg-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Mate-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             <div class="col-sm-4">

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Mate-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

            </div>

+           -->

            <div class="white">

-             <div class="col-lg-1">

-             <img src="/static/images/soas.png" />

-             </div>

-             <div class="col-lg-4">

-             <h3>${_('Sugar on a Stick')}</h3>

+             <div class="col-sm-3">

+               <img src="/static/images/soas.png" />

              </div>

-             <div class="col-lg-3">

-             <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ARM_SoaS']}</p>

+             <div class="col-sm-5">

+               <h3>${_('Sugar on a Stick')}</h3>

              </div>

-             <div class="col-lg-4">

-             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-SoaS-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             <div class="col-sm-4">

+               <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-SoaS-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

            </div>

          </div>

        </div>

      </div>

-   </div>

  

-   <!-- Desktops mobile phones-->

-   <div class="jumbotron main-head top-space desktop visible-xs">

-     <div class="container using">

-       <div class="row">

-         <div class="col-xs-12">

-         <h2>${_('Desktop Computing')}</h2>

-         </div>

-       </div>

-       <div class="row">

-         <div class="col-xs-12 product-feature">

-         <p>${_('These images are for ARM-based mediacenters, kiosks, laptops, and other ARM-powered devices where a graphical interface is desired.')}</p>

-         </div>

-       </div>

-       <div class="row">

-         <!--<div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/workstation.png" />

-           </div>

-           <div class="col-xs-9">

-           <h3>${_('Fedora Workstation')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/armhfp/images/Fedora-Workstation-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

- 	</div>-->

-         <div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/kde.png" />

-           </div>

-           <div class="col-xs-9">

-           <h3>${_('KDE Plasma Desktop')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-KDE-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

-         </div>

-         <div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/xfce.png" />

-           </div>

-           <div class="col-xs-9">

-           <h3>${_('Xfce Desktop')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Xfce-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

-         </div>

- <!--        <div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/lxqt.png" />

-           </div>

-           <div class="col-xs-9">

-           <h3>${_('LXQt Desktop')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXQt-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

-         </div> -->

-         <div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/lxde.png" />

-           </div>

-           <div class="col-xs-9">

-           <h3>${_('LXDE Desktop')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXDE-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

-         </div>

-         <div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/mate.png" />

-           </div>

-           <div class="col-xs-9">

-           <h3>${_('MATE-Compiz Desktop')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Mate-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

-         </div>

-         <div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/soas.png" />

-           </div>

-           <div class="col-xs-9">

-           <h3>${_('Sugar on a Stick')}</h3>

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-SoaS-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+     <!-- ARM Labs -->

+     <div class="jumbotron main-head top-space visible-lg hidden-xs hidden-sm hidden-md">

+       <div class="container using">

+         <div class="row">

+           <div class="col-xs-12">

+             <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Labs'))}</h2>

+           </div>

+         </div>

+         <div class="row">

+           <div class="col-lg-3 product-feature">

+             <p>${_('These images are for ARM-based devices where a bundle of purpose-driven software is needed.')}</p>

+           </div>

+           <div class="col-lg-9">

+             <div class="white">

+               <div class="col-lg-1">

+                 <img src="/static/images/python.png" />

+               </div>

+               <div class="col-lg-4">

+                 <h3>${_('Python-Classroom')}</h3>

+               </div>

+               <div class="col-lg-3">

+                 <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Python']}</p>

+               </div>

+               <div class="col-lg-4">

+                 <p class="download"><a href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/armhfp/images/Fedora-Python-Classroom-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+               </div>

+             </div>

            </div>

          </div>

        </div>

      </div>

-   </div>

  

-   <!-- Desktops mobile tablets-->

-   <div class="jumbotron main-head top-space desktop visible-sm-md hidden-xs hidden-lg">

-     <div class="container using">

-       <div class="row">

-         <div class="col-xs-12">

-         <h2>${_('Desktop Computing')}</h2>

-         </div>

-       </div>

-       <div class="row">

-         <div class="col-xs-12 product-feature">

-         <p>${_('These images are for ARM-based mediacenters, kiosks, laptops, and other ARM-powered devices where a graphical interface is desired.')}</p>

-         </div>

-       </div>

-       <div class="row">

-         <!--<div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/workstation.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('Fedora Workstation')}</h3>

-           </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/armhfp/images/Fedora-Workstation-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

- 	</div>-->

-         <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/kde.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('KDE Plasma Desktop')}</h3>

-           </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-KDE-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

-         </div>

-         <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/xfce.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('Xfce Desktop')}</h3>

-           </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Xfce-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

-         </div>

- <!--        <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/lxqt.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('LXQt Desktop')}</h3>

-           </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXQt-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

-           </div>

-         </div> -->

-         <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/lxde.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('LXDE Desktop')}</h3>

-           </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-LXDE-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+     <!-- ARM Labs mobile phone -->

+     <div class="jumbotron main-head top-space visible-xs">

+       <div class="container using">

+         <div class="row">

+           <div class="col-xs-12">

+             <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Labs'))}</h2>

            </div>

          </div>

-         <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/mate.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('MATE-Compiz Desktop')}</h3>

-           </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-Mate-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+         <div class="row">

+           <div class="col-xs-12 product-feature">

+             <p>${_('These images are for ARM-based devices where a bundle of purpose-driven software is needed.')}</p>

            </div>

          </div>

-         <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/soas.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('Sugar on a Stick')}</h3>

-           </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/armhfp/images/Fedora-SoaS-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+         <div class="row">

+           <div class="white">

+             <div class="col-xs-3">

+               <img src="/static/images/python.png" />

+             </div>

+             <div class="col-xs-9">

+               <h3>${_('Python-Classroom')}</h3>

+               <p class="download"><a href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/armhfp/images/Fedora-Python-Classroom-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             </div>

            </div>

          </div>

        </div>

      </div>

-   </div>

  

-   <!-- ARM Labs -->

-   <div class="jumbotron main-head top-space visible-lg hidden-xs hidden-sm hidden-md">

-     <div class="container using">

-       <div class="row">

-         <div class="col-xs-12">

-         <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Labs'))}</h2>

+     <!-- ARM Labs mobile tablets -->

+     <div class="jumbotron main-head top-space visible-sm-md hidden-xs hidden-lg">

+       <div class="container using">

+         <div class="row">

+           <div class="col-xs-12">

+             <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Labs'))}</h2>

+           </div>

          </div>

-       </div>

-       <div class="row">

-         <div class="col-lg-3 product-feature">

-         <p>${_('These images are for ARM-based devices where a bundle of purpose-drive software is needed.')}</p>

+         <div class="row">

+           <div class="col-xs-12 product-feature">

+             <p>${_('These images are for ARM-based devices where a bundle of purpose-driven software is needed.')}</p>

+           </div>

          </div>

-         <div class="col-lg-9">

+         <div class="row">

            <div class="white">

-             <div class="col-lg-1">

-             <img src="/static/images/python.png" />

-             </div>

-             <div class="col-lg-4">

-             <h3>${_('Python-Classroom')}</h3>

+             <div class="col-sm-3">

+               <img src="/static/images/python.png" />

              </div>

-             <div class="col-lg-3">

-             <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Python']}</p>

+             <div class="col-sm-5">

+               <h3>${_('Python-Classroom')}</h3>

              </div>

-             <div class="col-lg-4">

-             <p class="download"><a href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/armhfp/images/Fedora-Python-Classroom-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+             <div class="col-sm-4">

+               <p class="download"><a href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/armhfp/images/Fedora-Python-Classroom-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

              </div>

            </div>

          </div>

        </div>

      </div>

-   </div>

  

-   <!-- ARM Labs mobile phone -->

-   <div class="jumbotron main-head top-space visible-xs">

-     <div class="container using">

-       <div class="row">

-         <div class="col-xs-12">

-         <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Labs'))}</h2>

-         </div>

-       </div>

-       <div class="row">

-         <div class="col-xs-12 product-feature">

-         <p>${_('These images are for ARM-based devices where a bundle of purpose-drive software is needed.')}</p>

-         </div>

-       </div>

-       <div class="row">

-         <div class="white">

-           <div class="col-xs-3">

-           <img src="/static/images/python.png" />

-           </div>

-           <div class="col-xs-9">

-           <h3>${_('Python-Classroom')}</h3>

-           <p class="download"><a href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/armhfp/images/Fedora-Python-Classroom-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+     <!-- Feature: ARM -->

+     <div class="jumbotron product-feature bluebox">

+       <div class="container">

+         <div class="row">

+ 	  <div class="col-xs-12 caption">

+ 	    <h2 class="text-center">${Markup(_('What is ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Technology?'))}</h2>

+ 	    <p class="thin text-justify">${_('ARM microprocessors are the most widely-produced processor family in the world; they have historically been used in cell phones and embedded applications, and are increasingly used in tablet devices and low-power-consumption servers.')}</p>

+ 	    <p class="thin text-justify">${_('The Fedora ARM project is an initiative to bring Fedora to this processor family. The images provided here are versions of Fedora tailored for running on ARM-based systems.')}</p>

            </div>

          </div>

        </div>

      </div>

-   </div>

  

-   <!-- ARM Labs mobile tablets -->

-   <div class="jumbotron main-head top-space visible-sm-md hidden-xs hidden-lg">

-     <div class="container using">

-       <div class="row">

-         <div class="col-xs-12">

-         <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Labs'))}</h2>

-         </div>

-       </div>

-       <div class="row">

-         <div class="col-xs-12 product-feature">

-         <p>${_('These images are for ARM-based devices where a bundle of purpose-drive software is needed.')}</p>

+     <!-- Resources -->

+     <div class="jumbotron whitesupport">

+       <div class="container">

+         <div class="row">

+           <div class="col-xs-12 text-center">

+             <h2>${_('Support Resources')}</h2>

+           </div>

          </div>

-       </div>

-       <div class="row">

-         <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/python.png" />

+         <div class="row top-margin">

+           <div class="col-md-4 col-xs-12 text-center">

+             <h3><i class="fa fa-fw fa-lg header-icon fa-book"></i>${_('Documentation')}</h3>

+             <p>${Markup(_('Fedora ARM documentation and installation guides are available at the &lt;a href="%s"&gt;Fedora ARM wiki page&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Architectures/ARM'))}</p>

            </div>

-           <div class="col-sm-5">

-           <h3>${_('Python-Classroom')}</h3>

+           <div class="col-md-4 col-xs-12 text-center">

+             <h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>

+             <p>${Markup(_('Users and developers are also available on the mailing list at &lt;a href="%s"&gt;arm@lists.fedoraproject.org&lt;/a&gt;.') % ('https://admin.fedoraproject.org/mailman/listinfo/arm'))}</p>

            </div>

-           <div class="col-sm-4">

-           <p class="download"><a href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/armhfp/images/Fedora-Python-Classroom-armhfp-${global_variables.release['curr_arm_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="verify.html">${_('Verify')}</a></p>

+           <div class="col-md-4 col-xs-12 text-center">

+             <h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>

+             <p>${Markup(_('Users and developers are available in the &lt;a href="%s"&gt;#fedora-arm&lt;/a&gt; irc channel on &lt;strong&gt;irc.freenode.org&lt;/strong&gt; for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-arm'))}</p>

            </div>

          </div>

-       </div>

-     </div>

-   </div>

- 

-   <!-- Feature: ARM -->

-   <div class="jumbotron product-feature bluebox">

-     <div class="container">

-       <div class="row">

- 	    <div class="col-xs-12 caption">

- 	      <h2 class="text-center">${Markup(_('What is ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Technology?'))}</h2>

- 	      <p class="thin text-justify">${_('ARM microprocessors are the most widely-produced processor family in the world; they have historically been used in cell phones and embedded applications, and are increasingly used in tablet devices and low-power-consumption servers.')}</p>

- 	      <p class="thin text-justify">${_('The Fedora ARM project is an initiative to bring Fedora to this processor family. The images provided here are versions of Fedora tailored for running in on ARM-based systems.')}</p>

-         </div>

-       </div>

-     </div>

-   </div>

- 

-   <!-- Resources -->

-   <div class="jumbotron whitesupport">

-     <div class="container">

-       <div class="row">

-         <div class="col-xs-12 text-center">

-           <h2>${_('Support Resources')}</h2>

-         </div>

-       </div>

-       <div class="row top-margin">

-         <div class="col-md-4 col-xs-12 text-center">

-           <h3><i class="fa fa-fw fa-lg header-icon fa-book"></i>${_('Documentation')}</h3>

-           <p>${Markup(_('Fedora ARM documentation and installation guides are available at the &lt;a href="%s"&gt;Fedora ARM wiki page&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Architectures/ARM'))}</p>

-         </div>

-         <div class="col-md-4 col-xs-12 text-center">

-           <h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>

-           <p>${Markup(_('Users and developers are also available on the mailing list at &lt;a href="%s"&gt;arm@lists.fedoraproject.org&lt;/a&gt;.') % ('https://admin.fedoraproject.org/mailman/listinfo/arm'))}</p>

-         </div>

-         <div class="col-md-4 col-xs-12 text-center">

-           <h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>

-           <p>${Markup(_('Users and developers are available in the &lt;a href="%s"&gt;#fedora-arm&lt;/a&gt; irc channel on &lt;strong&gt;irc.freenode.org&lt;/strong&gt; for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-arm'))}</p>

-         </div>

-       </div>

-       <div class="row top-margin">

-         <div class="col-xs-12 text-center">

-           <h4><i class="fa fa-fw header-icon fa-question-circle"></i>${_('General Help Using Fedora')}</h4>

-           <p>${Markup(_('Sometimes you may encounter an issue with this spin that you can get help with using general Fedora support resources. A list of resources is available at the &lt;a href="%s"&gt;Fedora &ldquo;Get Help&rdquo; page&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Communicating_and_getting_help'))}</p>

+         <div class="row top-margin">

+           <div class="col-xs-12 text-center">

+             <h4><i class="fa fa-fw header-icon fa-question-circle"></i>${_('General Help Using Fedora')}</h4>

+             <p>${Markup(_('Sometimes you may encounter an issue with this spin that you can get help with using general Fedora support resources. A list of resources is available at the &lt;a href="%s"&gt;Fedora &ldquo;Get Help&rdquo; page&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Communicating_and_getting_help'))}</p>

+           </div>

          </div>

        </div>

      </div>

-   </div>

  

- </body>

+   </body>

  </html>

@@ -35,25 +35,26 @@ 

          <div class="col-sm-4 col-xs-12 text-center">

            <h4 class="uppercase top-margin">${_('Server')}</h4>

            <div class="h-body text-center">

-             <a class="btn btn-default btn-topmargin btn-fix-verify" href="https://getfedora.org/static/checksums/Fedora-Server-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Server!')}</a>

+             <a class="btn btn-default btn-topmargin btn-fix-verify" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/iso/Fedora-Server-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Server iso')}</a>

+             <a class="btn btn-default btn-topmargin btn-fix-verify" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Server-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Server images')}</a>

            </div>

            <div class="h-body text-center">

-             <a class="btn btn-default btn-topmargin btn-fix-verify" href="https://getfedora.org/static/checksums/Fedora-Spins-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Minimal!')}</a>

+             <a class="btn btn-default btn-topmargin btn-fix-verify" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Spins-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Minimal')}</a>

            </div>

          </div>

          <div class="col-sm-4 col-xs-12 text-center">

            <h4 class="uppercase top-margin">${_('Desktop')}</h4>

            <div class="h-body text-center">

-             <a class="btn btn-default btn-topmargin btn-fix-verify" href="https://getfedora.org/static/checksums/Fedora-Workstation-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Workstation!')}</a>

+             <a class="btn btn-default btn-topmargin btn-fix-verify" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Workstation-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Workstation images')}</a>

            </div>

            <div class="h-body text-center">

-             <a class="btn btn-default btn-topmargin btn-fix-verify" href="https://getfedora.org/static/checksums/Fedora-Spins-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Spins!')}</a>

+             <a class="btn btn-default btn-topmargin btn-fix-verify" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Spins-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Spins images')}</a>

            </div>

          </div>

          <div class="col-sm-4 col-xs-12 text-center">

            <h4 class="uppercase top-margin">${_('Labs')}</h4>

            <div class="h-body text-center">

-             <a class="btn btn-default btn-topmargin btn-fix-verify" href="https://getfedora.org/static/checksums/Fedora-Labs-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Labs!')}</a>

+             <a class="btn btn-default btn-topmargin btn-fix-verify" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Labs-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-armhfp-CHECKSUM">${_('Verify Labs images')}</a>

            </div>

          </div>

      </div>
@@ -67,9 +68,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

              <p>${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}</p>

              <ul>

+                 <li><code>45719A39</code> - ${_('Fedora 34')}</li>

+                 <li><code>9570FF31</code> - ${_('Fedora 33')}</li>

                  <li><code>12C944D0</code> - ${_('Fedora 32')}</li>

-                 <li><code>3C3359C4</code> - ${_('Fedora 31')}</li>

-                 <li><code>CFC659B9</code> - ${_('Fedora 30')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

              <p>${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}</p>

@@ -1,5 +1,8 @@ 

  include ../Makefile.in

  

+ # retired

+ pullpos: ;

+ 

  $(LANGUAGES): % : | static po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

@@ -1,5 +1,8 @@ 

  include ../Makefile.in

  

+ # no translation

+ pullpos: ;

+ 

  $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

file modified
+1 -1
@@ -1,7 +1,7 @@ 

  #!/usr/bin/python

  import sys

  

- languages = []

+ languages = [("en", "en"),]

  

  linguasfile = sys.argv[1]

  linguas = open(linguasfile)

@@ -1,6 +1,7 @@ 

  #!/bin/env python

  

  import ConfigParser, sys, os

+ import langtable

  

  '''

  This script takes the contents of the website-specific LINGUAS file, constructs an options menu for the languages contained therein.
@@ -40,7 +41,8 @@ 

                  lang = lang.strip()

                  if lang and not lang.startswith('#') and not lang in banned:

                      #output.write('    <option value="' + lang + '" py:attrs="{\'selected\': lang == \'' + lang + '\' and \'selected\' or None}">' + language_map.get('Languages',lang) + '</option>\n')

-                     output.write(", '"+lang+"': '"+language_map.get('Languages',lang)+"'")

+                     #output.write(", '"+lang+"': '"+language_map.get('Languages',lang)+"'")

+                     output.write(", '"+lang+"': '"+langtable.language_name(languageId=lang).encode('utf-8')+"'")

          finally:

              linguas.close()

          output.write("""}

file modified
+27 -25
@@ -2,37 +2,37 @@ 

  # -*- coding: utf-8 -*-

  # This file defines all variable needed to be edited during the release cycle (alpha, beta...).

  release={

-     'prev_id':     '32',

-     'curr_id':     '33',

-     'next_id':     '34',

+     'prev_id':     '33',

+     'curr_id':     '34',

+     'next_id':     '35',

      'curr_name':   '',

      'next_name':   '',

-     'curr_state':  'Beta',           # either 'Alpha', 'Beta' or '' (i.e empty)

-     'curr_arm_state':  'Beta',       # either 'Alpha', 'Beta' or '' (i.e empty)

-     'curr_alt_state':  'Beta',       # either 'Alpha', 'Beta' or '' (i.e empty)

-     'curr_cloud_state':  'Beta',     # either 'Alpha', 'Beta' or '' (i.e empty)

-     'curr_cloud_AMI_state':  'Beta', # either 'Alpha', 'Beta' or '' (i.e empty)

-     'curr_server_state':  'Beta',    # either 'Alpha', 'Beta' or '' (i.e empty)

+     'curr_state':  '',           # either 'Alpha', 'Beta' or '' (i.e empty)

+     'curr_arm_state':  '',       # either 'Alpha', 'Beta' or '' (i.e empty)

+     'curr_alt_state':  '',       # either 'Alpha', 'Beta' or '' (i.e empty)

+     'curr_cloud_state':  '',     # either 'Alpha', 'Beta' or '' (i.e empty)

+     'curr_cloud_AMI_state':  '', # either 'Alpha', 'Beta' or '' (i.e empty)

+     'curr_server_state':  '',    # either 'Alpha', 'Beta' or '' (i.e empty)

      'curr_atomic_state':  '',    # 'Pre-Release' or '' - No Alpha/Beta for Atomic Host

-     'prev_arm_id': '32',

-     'prev_alt_id': '32',

-     'prev_cloud_id': '32',

+     'prev_arm_id': '33',

+     'prev_alt_id': '33',

+     'prev_cloud_id': '33',

      'prev_atomic_id': '30',

-     'curr_arm_id': '33',

-     'curr_alt_id': '33',

-     'curr_cloud_id': '33',

+     'curr_arm_id': '34',

+     'curr_alt_id': '34',

+     'curr_cloud_id': '34',

      'curr_atomic_id': '30',

-     'curr_server_id': '33',

-     'curr_cloud_AMI_id': '33',

-     'curr_iot_id': '33',

-     'curr_silverblue_id': '33',

-     'next_silverblue_id': '34',

-     'next_arm_id': '34',

-     'next_alt_id': '34',

-     'next_cloud_id': '34',

+     'curr_server_id': '34',

+     'curr_cloud_AMI_id': '34',

+     'curr_iot_id': '34',

+     'curr_silverblue_id': '34',

+     'next_silverblue_id': '35',

+     'next_arm_id': '35',

+     'next_alt_id': '35',

+     'next_cloud_id': '35',

      'next_atomic_id': '30',

-     'next_server_id': '34',

-     'next_cloud_AMI_id': '34',

+     'next_server_id': '35',

+     'next_cloud_AMI_id': '35',

      'composedate': '20160616',

      'unofficial_compose': '20181029',

      'alt_composedate': '20161118',
@@ -127,6 +127,8 @@ 

      'aarch64_raw':         '190',       # In MB

      'aarch64_Container':   '43',        # In MB

      'aarch64_WS':          '2.8',       # In GB

+     'aarch64_KDE_live':         '1.9',       # In GB

+     'aarch64_KDE_raw':         '4.0',       # In GB

      'aarch64_min':         '412',       # In MB

      'ppc64_Server_DVD':    '3.0',       # In GB

      'ppc64_Server_net':    '597',       # In MB

file modified
+1 -1
@@ -1,5 +1,5 @@ 

  include ../Makefile.in

  

- $(LANGUAGES): % : | static po/%.mo data/templates/translations.html

+ en $(LANGUAGES): % : | static po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

@@ -1,5 +1,8 @@ 

  include ../Makefile.in

  

+ # retired? 

+ pullpos: ;

+ 

  $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

@@ -1,5 +1,8 @@ 

  include ../Makefile.in

  

+ # Not translated, yet

+ pullpos: ;

+ 

  $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

@@ -21,7 +21,7 @@ 

            <div id="welcome" class="non-jumbo text-center">

                <img src="${path}/static/images/flocklogo2.png" alt="Flock"/>

              <h1>Your house</h1>

-             <h2>2020</h2>

+             <h2>2021</h2>

            </div>

            </div>

          </div>
@@ -35,10 +35,10 @@ 

            <h2>What is Flock?</h2>

            <p>Flock is the <a href="https://docs.fedoraproject.org/en-US/project/" target="_blank">Fedora Project</a>'s annual contributor-focused conference. It typically alternates between European and North American locations. The conference provides a venue for face to face meetings and conversations. It is also a place to celebrate our community.</p>

            

-           <p><strong>Due to COVID-19, we have decided to cancel Flock 2020 in Detroit.</strong> But we still want to do something fun, so we're having <a href="https://communityblog.fedoraproject.org/nest-with-fedora-call-for-ideas/">Nest With Fedora</a>! The safety of our community is the most important thing, and we look forward to getting everyone together in 2021.</p>

+           <p><strong>Due to COVID-19, we will not have an in-person Flock this year.</strong> But we still want to do something fun, so we're bringing back <a href="https://communityblog.fedoraproject.org/announcing-dates-cfp-for-nest-with-fedora/">Nest With Fedora</a>! The safety of our community is the most important thing, and we look forward to getting everyone together in 2022.</p>

  

            <h2>What will we do at Flock?</h2>

-          <p>The <a href="https://hopin.to/events/nest-with-fedora#schedule">schedule</a> is now available.</p>

+ <!--         <p>The <a href="https://hopin.to/events/nest-with-fedora#schedule">schedule</a> is now available.</p>-->

            <ul>

                <li align="left"><b>Communicate the Fedora Strategy.</b> Everyone in Fedora should understand and feel well-aligned with the project's goals, both long-term and tactical. We should all understand the messaging we're using to attract new users and contributors.</li>

                <li align="left"><b>Plan the Next Strategy.</b> This strategy doesn't come from the top down, or from thin air, and it's not dictated by our sponsors. It comes from the community. Because we're so big and distributed, Flock can't be the only place where we get new ideas, but it is a summit where we present, learn about, and discuss them.</li>
@@ -59,12 +59,13 @@ 

            <h2>Schedule</h2>

            

            <p>

-             <strong>The <a href="https://hopin.to/events/nest-with-fedora#schedule">Nest schedule</a> is now available!</strong>

+             Coming in late July or early August.

+ <!--            <strong>The <a href="https://hopin.to/events/nest-with-fedora#schedule">Nest schedule</a> is now available!</strong>-->

            </p>

            

  

            <h2>Event Dates</h2>

-           <p>Nest will begin the morning of Friday, August 7. Sessions will continue each day until Sunday, August 9. <!--You should plan to arrive by Wednesday, August 5 and to depart no sooner than Sunday afternoon for the best experience.--></p>

+           <p>Nest will begin the morning of Thursday, August 5. Sessions will continue each day until Sunday, August 8. <!--You should plan to arrive by Wednesday, August 5 and to depart no sooner than Sunday afternoon for the best experience.--></p>

  

            <table class="calendar">

                <tr>
@@ -80,17 +81,16 @@ 

                  <td></td>

                  <td></td>

                  <td></td>

-                 <td></td>

-                 <td class="flock" colspan="3">Nest</td>

+                 <td class="flock" colspan="4">Nest</td>

                </tr>

                <tr>

+                 <td>Aug <span>2</span></td>

                  <td>Aug <span>3</span></td>

                  <td>Aug <span>4</span></td>

-                 <td>Aug <span>5</span></td>

-                 <td>Aug <span>6</span></td>

+                 <td class="flock">Aug <span>5</span></td>

+                 <td class="flock">Aug <span>6</span></td>

                  <td class="flock">Aug <span>7</span></td>

                  <td class="flock">Aug <span>8</span></td>

-                 <td class="flock">Aug <span>9</span></td>

                </tr>

              </table>

  
@@ -119,55 +119,39 @@ 

        <div class="row">

          <div class="col-xs-12 col-md-8 col-md-offset-2">

              <h2>Call for Participation</h2>

- <!--             <p>This year we are holding Nest with Fedora as a virtual replacement for our normal Flock to Fedora contributor conference. We are taking submissions in the <a href="https://pagure.io/flock/">Flock Pagure repository</a>.</p> -->

- 

- <!--             <p>As we are able to record all of our content very easily this year, try to think about storytelling when you submit your papers. What kind of story can you tell about your team, project, initiative, or the overall community?</p> -->

- 

- <!--             <h3>Examples</h3> -->

- <!--             <p>“At Fedora’s contributor conference, Nest with Fedora, the Fedora Design team closed 10 tickets, updated their wiki/docs page, and came up with a strategy for the next year.”</p> -->

- 

- <!--             <p>“At Fedora’s contributor conference, Nest with Fedora, we had 000 participants show up with their pets!” (Social hour, bring your pet! Gather pet photos and create an album to go along with that story)</p> -->

- 

- <!--             <p>As we are able to meet with our teams on a regular basis online, try to focus work sessions on strategy and plenary work for the upcoming year.</p> -->

- 

- <!--             <h3>Tracks</h3> -->

- <!--             <p>Nest with Fedora has five tracks. They are listed below with example submissions.</p> -->

- 

- <!--            <ul class="non-jumbo text-left">

-                 <li><strong>General Ideas</strong><ul>

-                     <li>Keynotes</li>

-                     <li>Team meetings</li>

-                     <li>Panel sessions</li>

-                 </ul></li>

-                 <li><strong>Ask the Experts</strong><ul>

-                     <li>Live sessions with experts and moderators taking questions (ex. IoT, editions, modularity, design)</li>

-                 </ul></li>

-                 <li><strong>Community</strong><ul>

-                     <li>Themed social hours (ex. bring your pet, costume party)</li>

-                     <li>Diversity themed sessions (ex. cooking across the world, how do you Fedora?)</li>

-                 </ul></li>

-                 <li><strong>Games</strong><ul>

-                     <li>Gaming SIG session</li>

-                     <li>Interactive game sessions (ex. Virtual Pictionary, bingo, trivia)</li>

-                     <li>Nintendo Switch meetup and Friend code exchange</li>

-                     <li>Asynchronous game sessions (ex. Minecraft)</li>

-                 </ul></li>

-                 <li><strong>Hackfests/Workshops</strong><ul>

-                     <li>Team work sessions</li>

-                     <li>Project hackfests</li>

-                 </ul></li>

-             </ul>-->

+              <p>This year we are holding Nest with Fedora as a virtual replacement for our normal Flock to Fedora contributor conference. We are taking submissions in the <a href="https://pagure.io/flock/">Flock Pagure repository</a>.</p> 

+ 

+              <p>As we are able to record all of our content very easily this year, try to think about storytelling when you submit your proposals. What kind of story can you tell about your team, project, initiative, or the overall community?</p> 

+ 

+              <h3>Examples</h3> 

+              <p>“At Fedora’s contributor conference, Nest with Fedora, the Fedora Design team closed 10 tickets, updated their wiki/docs page, and came up with a strategy for the next year.”</p> 

+ 

+              <p>“At Fedora’s contributor conference, Nest with Fedora, we had 000 participants show up with their pets!” (Social hour, bring your pet! Gather pet photos and create an album to go along with that story)</p> 

+ 

+              <p>As we are able to meet with our teams on a regular basis online, try to focus work sessions on strategy and plenary work for the upcoming year.</p> 

+ 

+              <h3>Formats</h3> 

+              <p>Nest with Fedora has five tracks. They are listed below with example submissions.</p> 

+ 

+             <ul class="non-jumbo text-left">

+                 <strong>General Ideas</strong>

+                     <li>Lightning Talk</li>

+                     <li>Session (25 minutes)</li>

+                     <li>Session (50 minutes)</li>

+                     <li>Workshop/Tutorial (110 minutes)</li>

+                     <li>Hackfest (half day)</li>

+             </ul>

  

              <h3>Submission deadline</h3>

-             <p>The submission deadline has passed.</p>

- <!--            <p>We will do a rolling deadline this year again with two acceptance dates.</p>

+ <!--             <p>The submission deadline has passed.</p> -->

+             <p>We will do a rolling deadline this year again with two acceptance dates.</p>

              <ul class="non-jumbo text-left">

-                 <li>Monday 20 July 2020</li>

-                 <li>Monday 27 July 2020</li>

-             </ul>-->

+                 <li>Friday 9 July 2021</li>

+                 <li>Friday 16 July 2021</li>

+             </ul>

  

- <!--	      <p>Submit your ideas for Nest With Fedora in the <a href="https://pagure.io/flock/">Flock Pagure repository</a>.</p>-->

-             <p>The CfP is now closed and the <a href="https://hopin.to/events/nest-with-fedora#schedule">schedule</a> is now available.</p>

+ 	      <p>Submit your ideas for Nest With Fedora in the <a href="https://pagure.io/flock/">Flock Pagure repository</a>.</p>

+ <!--            <p>The CfP is now closed and the <a href="https://hopin.to/events/nest-with-fedora#schedule">schedule</a> is now available.</p>-->

   <!--

  

              <p>We invite you to submit proposals for talks (25/50 minutes) or workshops( 2 hours),  or hackfests/FADs (half or full day) on topics of importance to the contributor community.</p>
@@ -198,6 +182,7 @@ 

        <div class="row">

          <div class="col-xs-12 col-md-8 col-md-offset-2">

            <h2>Registration Information</h2>

+               <p>Coming soon!</p>

  <!--          <p><a href="https://hopin.to/events/nest-with-fedora">Register now</a> for Nest With Fedora. Nest will use the Hopin platform, generously provided by the Apache Software Foundation.</p>-->

  

          </div>
@@ -278,7 +263,7 @@ 

          <div class="col-xs-12 col-md-8 col-md-offset-2">

            <h2>Venue and Hotel</h2>

  

- 	  <p>Nest With Fedora will be held on <a href="https://hopin.to/events/nest-with-fedora">Hopin</a>, generously provided by the Apache Software Foundation.</p>

+ 	  <p>Nest With Fedora will be held on Hopin.</p>

  <!--

            <div class="col-xs-12 col-md-7">

        <p><a href="https://www.danubiushotels.com/helia">The Danubius Hotel HELIA</a> in Budapest, Hungary is both the conference venue as well as the conference hotel.</p>
@@ -350,7 +335,7 @@ 

            </p>

            <br/>

            <h3>Gold Level</h3>

-           <p>

+ <!--          <p>

              <a href="https://www.opensuse.org/"><img src="../../static/images/opensuse.png"/></a>

            </p>

             <p>
@@ -358,9 +343,9 @@ 

            </p>

             <p>

              <a href="https://www.lenovo.com/"><img src="../../static/images/sponsors/lenovo.png"/></a>

-           </p>

+           </p>-->

            <h3>Bronze Level</h3>

-           <p>

+ <!--          <p>

              <a href="https://www.datto.com/"><img src="../../static/images/sponsors/Datto-blue-RGB.png"/></a>

            </p>

            <p>
@@ -368,7 +353,7 @@ 

            </p>

            <p>

              <a href="https://www.spigotmc.org/"><img src="../../static/images/sponsors/spigot.png"/></a>

-           </p>

+           </p>-->

          </div>

        </div>

        </div>

file modified
+3
@@ -1,5 +1,8 @@ 

  include ../Makefile.in

  

+ # moved (see fedora-web/websites)

+ pullpos: ;

+ 

  $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

@@ -1,5 +1,5 @@ 

  include ../Makefile.in

  

- $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

+ en $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

@@ -54,7 +54,7 @@ 

            <h4>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Technology'))}</h4>

            <ul>

                <li>

-                   <p><a class="python-classroom-download-splash" href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/armhfp/images/Fedora-Python-Classroom-armhfp-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-sda.raw.xz">${Markup(_('%sGB ARM image')) % global_variables.iso_size['ARM_Py_Class']}</a></p>

+                   <p><a class="python-classroom-download-splash" href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/armhfp/images/Fedora-Python-Classroom-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.armhfp.raw.xz">${Markup(_('%sGB ARM image')) % global_variables.iso_size['ARM_Py_Class']}</a></p>

                </li>

            </ul>

            <h4>${_('Older Releases')}</h4>

@@ -33,7 +33,8 @@ 

      </div>

      <div class="row bottom-margin">

          <div class="col-sm-4 col-xs-12">

-           <a class="btn btn-default btn-topmargin" href="https://getfedora.org/static/checksums/Fedora-Labs-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify 64-bit!')}</a>

+           <a class="btn btn-default btn-topmargin" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/iso/Fedora-Labs-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify 64-bit iso')}</a>

+           <a class="btn btn-default btn-topmargin" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/images/Fedora-Labs-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify 64-bit images')}</a>

          </div>

      </div>

  
@@ -46,9 +47,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

              <p>${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}</p>

              <ul>

+                 <li><code>45719A39</code> - ${_('Fedora 34')}</li>

+                 <li><code>9570FF31</code> - ${_('Fedora 33')}</li>

                  <li><code>12C944D0</code> - ${_('Fedora 32')}</li>

-                 <li><code>3C3359C4</code> - ${_('Fedora 31')}</li>

-                 <li><code>CFC659B9</code> - ${_('Fedora 30')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

              <p>${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}</p>

@@ -7,6 +7,6 @@ 

  

  	<h3>${_('Documentation and other resources')}</h3>

  	<p>${Markup(_('Before installing Fedora, you may want to confirm your system meets minimum requirements for Fedora. Consult &lt;a href="%(release_notes)s"&gt;the online release notes&lt;/a&gt; to see minimum requirements and recommendations.') % {'release_notes': 'https://docs.fedoraproject.org/en-US/fedora/f%s/release-notes/' % (global_variables.release['curr_id'])})}</p>

- 	<p>${Markup(_('There is also a &lt;a href="%(install_guide)s"&gt;complete Installation Guide&lt;/a&gt; available. We recommend you look through it before installing to your system, since it answers many common questions.') % {'install_guide': 'https://docs.fedoraproject.org/f%s/install-guide/' % (global_variables.release['curr_id'])})}</p>

+ 	<p>${Markup(_('There is also a &lt;a href="%(install_guide)s"&gt;complete Installation Guide&lt;/a&gt; available. We recommend you look through it before installing to your system, since it answers many common questions.') % {'install_guide': 'https://docs.fedoraproject.org/en-US/fedora/f%s/install-guide/' % (global_variables.release['curr_id'])})}</p>

  

  </html>

@@ -7,10 +7,4 @@ 

  

  	<h3>${Markup(_('Verify your Download!'))}</h3>

      	<p>${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow &lt;a href="../../%s/verify"&gt;these instructions&lt;/a&gt;.') % (lang))}</p>

-         <div class="row bottom-margin">

-             <div class="col-sm-4 col-xs-12">

-               <a class="btn btn-default btn-topmargin" href="https://getfedora.org/static/checksums/Fedora-Labs-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify 64bit!')}</a>

-             </div>

-           </div>

- 

  </html>

@@ -1,5 +1,5 @@ 

  include ../Makefile.in

  

- $(LANGUAGES): % : | static po/%.mo data/templates/translations.html

+ en $(LANGUAGES): % : | static po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

@@ -17,7 +17,7 @@ 

        <div class="row">

          <div class="col-md-7 col-md-offset-5 text-left">

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

-             <p class="gr"><a class="btn btn-success cinnamon-download-splash" href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/x86_64/iso/Fedora-Cinnamon-Live-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso" role="button">${_('Download')}</a></p>

+             <p class="gr"><a class="btn btn-success cinnamon-download-splash" href="https://dl.fedoraproject.org/pub/alt/unofficial/releases/34/Fedora-Cinnamon-Live-x86_64-34-1.2.iso" role="button">${_('Download')}</a></p>

          </div>

        </div>

      </div>

@@ -149,6 +149,20 @@ 

    	  	  </div>

    	    </div>

  	     </div>

+ 

+        <div class="high">

+     	  <div class="row">

+     	  	<div class="col-xs-10 col-xs-offset-1 text-center top-space">

+     	  	  <a href="/${lang}/i3"><img class="screenshot" src="${path}/static/images/screenshots/screenshot-i3.jpg" alt="i3 Screenshot" /></a>

+     	  	</div>

+     	  </div>

+     	  <div class="row">

+     	  	<div class="col-xs-10 col-xs-offset-1 text-center bottom-space">

+     	  	  <p class="screenshot bottom-border"><a href="/${lang}/i3"><img class="spin-banner" src="${path}/static/images/i3-banner.png" alt="i3 banner" /></a><br />

+     	  	  <span class="grey">${_('Tiling window manager.')}</span></p>

+   	  	  </div>

+   	    </div>

+ 	     </div>

       </div>

    	</div>

    </header>

@@ -34,7 +34,8 @@ 

            <h3>${_('Other Downloads')}</h3>

            <h4>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; Technology'))}</h4>

            <ul>

-             <li><a href="https://arm.fedoraproject.org/">arm.fedoraproject.org</a></li>

+             <li><a href="https://alt.fedoraproject.org/alt">ARMv8 (aarch64)</a></li>

+             <li><a href="https://arm.fedoraproject.org/">ARMv7 (armhfp)</a></li>

            </ul>

            <h4>${_('Older Releases')}</h4>

            <ul>

@@ -89,9 +89,9 @@ 

          <div class="col-md-6 col-xs-12 text-center darkgreybg recover-jumbo">

            <h2>${Markup(_('Office &amp; Productivity Suite'))}</h2>

            <div class="col-md-6 col-xs-12 text-center top-margin">

-           <img src="${path}/static/images/kde/calligra.png" alt="Calligra" />

-           <h4>${_('Calligra')}</h4>

-           <p>${_('Calligra is an integrated office suite built on KDE Platform. It utilizes free and open standards like OpenDocument for its document formats and components.')}</p>

+           <img src="${path}/static/images/kde/libreoffice.png" alt="LibreOffice" />

+           <h4>${_('LibreOffice')}</h4>

+           <p>${_('LibreOffice is a free and powerful office suite. Its clean interface and feature-rich tools help you unleash your creativity and enhance your productivity.')}</p>

          </div>

          <div class="col-md-6 col-xs-12 text-center top-margin">

            <img src="${path}/static/images/kde/okular.png" alt="Okular" />
@@ -111,17 +111,22 @@ 

          </div>

        </div>

        <div class="row top-margin bottom-margin">

-         <div class="col-md-4 col-xs-12 text-center">

+         <div class="col-md-3 col-xs-12 text-center">

+           <img src="${path}/static/images/kde/elisa.png" alt="Elisa" />

+           <h4>${_('Elisa')}</h4>

+           <p>${_('A simple music player that should be easy to use. It does not require any configuration before one can use it.')}</p>

+         </div>

+         <div class="col-md-3 col-xs-12 text-center">

            <img src="${path}/static/images/kde/dragonplayer.png" alt="Dragon Player" />

            <h4>${_('Dragon Player')}</h4>

            <p>${_('A multimedia player where the focus is on simplicity, instead of features. Its simple interface is designed not to get in your way and instead empower you to simply play multimedia files.')}</p>

          </div>

-         <div class="col-md-4 col-xs-12 text-center">

+         <div class="col-md-3 col-xs-12 text-center">

            <img src="${path}/static/images/kde/k3b.png" alt="K3B" />

            <h4>${_('K3B')}</h4>

            <p>${_('K3B allows you to easily back up your multimedia files as it\'s a full featured CD/DVD writing software. K3B supports writing data CDs/DVDs, audio CDs, video CDs, DVDs, copying, CD ripping and more.')}</p>

          </div>

-         <div class="col-md-4 col-xs-12 text-center">

+         <div class="col-md-3 col-xs-12 text-center">

            <img src="${path}/static/images/kde/gwenview.png" alt="Gwenview" />

            <h4>${_('Gwenview')}</h4>

            <p>${_('Gwenview is able to load and save to a variety of image formats, such as PNG and JPEG. Its simple interface does not get in the way and lets you view your images quickly and easily.')}</p>

@@ -33,7 +33,7 @@ 

      </div>

      <div class="row bottom-margin">

          <div class="col-sm-4 col-xs-12">

-           <a class="btn btn-default btn-topmargin" href="https://getfedora.org/static/checksums/Fedora-Spins-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify 64-bit!')}</a>

+           <a class="btn btn-default btn-topmargin" href="${global_variables.path['checksums']}/${global_variables.release['curr_alt_id']}/iso/Fedora-Spins-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify 64-bit iso')}</a>

          </div>

      </div>

  
@@ -46,9 +46,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

              <p>${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}</p>

              <ul>

+                 <li><code>45719A39</code> - ${_('Fedora 34')}</li>

+                 <li><code>9570FF31</code> - ${_('Fedora 33')}</li>

                  <li><code>12C944D0</code> - ${_('Fedora 32')}</li>

-                 <li><code>3C3359C4</code> - ${_('Fedora 31')}</li>

-                 <li><code>CFC659B9</code> - ${_('Fedora 30')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

              <p>${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}</p>

@@ -7,11 +7,4 @@ 

  

  	<h3>${Markup(_('Verify your Download!'))}</h3>

      	<p>${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow &lt;a href="/%s/verify"&gt;these instructions&lt;/a&gt;.') % (lang))}</p>

-           <div class="row bottom-margin">

-             <div class="col-sm-4 col-xs-12">

-               <a class="btn btn-default btn-topmargin" href="https://getfedora.org/static/checksums/Fedora-Spins-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify 64bit!')}</a>

-             </div>

- 

-           </div>

- 

  </html>

empty or binary file added
@@ -1,8 +1,9 @@ 

  include ../Makefile.in

  

- $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

+ en $(LANGUAGES): % : | static rss-cache po/%.mo data/templates/translations.html

  	$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)

  

  rss-cache:

  	@echo Caching Magazine Feed...

- 	$(PYTHON) $(PWD)/build/magfeed.py -o out -s static -b $(BASEPATH) 

\ No newline at end of file

+ 	$(PYTHON) $(PWD)/build/magfeed.py -o out -s static -b $(BASEPATH)

+ 

@@ -17,7 +17,7 @@ 

  }

  

  .bluebox {

-   background-color: #3c6eb4;

+   background-color: #52a2da;

    height: 85px;

  }

  
@@ -74,7 +74,7 @@ 

  }

  

  .white h3 {

-   color: #3c6eb4;

+   color: #52a2da;

    margin-top: 12px;

  }

  
@@ -95,7 +95,7 @@ 

  }

  

  .readme {

-   background-color: #3c6eb4;

+   background-color: #52a2da;

    color: #fff;

    border-radius: 5px;

    -moz-border-radius: 5px;

Same as PR#1081 but for staging, as we may want to try it there first.
This also include some catch-up to master branch.

I have been discussing with @darknao regarding these changes.
I trust him to be able to fix localization issues with this change.

27 new commits added

  • use langtable library to dynamically build the language menu
  • ignore pullpos for non-translated/retired site
  • build en site independently of LINGUAS content
  • Fix a couple of date updates I missed
  • Initial prep of Flock^W Nest 2021 content
  • "Fix" the link to the install guide on download splashes.
  • Update with the new logo
  • re-apply 4a594a07dc4e6b13c5956286f8e454547898cf54
  • Merge branch 'master' into f34
  • Use the KDE logo for KDE Plasma downloads
  • Add aarch64 link to KDE Plasma download page
  • Add KDE Plasma's new aarch64 deliverables
  • [spins] Move Cinnamon for f34 release
  • [labs] filename format change for python classroom
  • [labs] checksum fixes
  • [spins] checksum fixes
  • Nix two missing arm spins
  • [arm] reindent index to make editing it feasible
  • [arm] checksum fixes
  • [alt] Fix up checksum links, and point them to new getfedora checksum dir format
  • bump globalvar
  • Revert "[alt] hardcode some changes for arm links"
  • Update the KDE Plasma screenshot for F34
  • Improve some wording.
  • Update setup instructions to note python2-genshi is required.
  • KDE Spin: Update for F34 showcased software
  • Add i3 to the Spins page
2 years ago

Pull-Request has been merged by bcotton

2 years ago

Merged. Let's see how it goes before we merge production.

@darknao looks like something's not quite right...

(repeats for all of the websites in the repo)

labs.fedoraproject.org build failed
====================================
Makefile:3: target `en' given more than once in the same rule.
python2.7 /srv/web/fedora-websites/labs.fedoraproject.org/../build.d/build.py -o out -s static -b /
python2.7 /usr/bin/pybabel extract -F /srv/web/fedora-websites/labs.fedoraproject.org/../build.d/pybabel.cfg data -o po/labs.fedoraproject.org.pot
extracting messages from data/content/index.html (extract_text="False")
extracting messages from data/content/prerelease.html (extract_text="False")
extracting messages from data/content/verify.html (extract_text="False")
extracting messages from data/content/astronomy/index.html (extract_text="False")
extracting messages from data/content/astronomy/download/astronomy-download-splash.html (extract_text="False")
extracting messages from data/content/astronomy/download/index.html (extract_text="False")
extracting messages from data/content/comp-neuro/index.html (extract_text="False")
extracting messages from data/content/comp-neuro/download/comp-neuro-download-splash.html (extract_text="False")
extracting messages from data/content/comp-neuro/download/index.html (extract_text="False")
extracting messages from data/content/design-suite/index.html (extract_text="False")
extracting messages from data/content/design-suite/download/design-download-splash.html (extract_text="False")
extracting messages from data/content/design-suite/download/index.html (extract_text="False")
extracting messages from data/content/e/404.html (extract_text="False")
extracting messages from data/content/games/index.html (extract_text="False")
extracting messages from data/content/games/download/games-download-splash.html (extract_text="False")
extracting messages from data/content/games/download/index.html (extract_text="False")
extracting messages from data/content/jam/index.html (extract_text="False")
extracting messages from data/content/jam/download/index.html (extract_text="False")
extracting messages from data/content/jam/download/jam-download-splash.html (extract_text="False")
extracting messages from data/content/python-classroom/index.html (extract_text="False")
extracting messages from data/content/python-classroom/download/index.html (extract_text="False")
extracting messages from data/content/python-classroom/download/python-classroom-download-splash.html (extract_text="False")
extracting messages from data/content/robotics/index.html (extract_text="False")
extracting messages from data/content/robotics/download/index.html (extract_text="False")
extracting messages from data/content/robotics/download/robotics-download-splash.html (extract_text="False")
extracting messages from data/content/scientific/index.html (extract_text="False")
extracting messages from data/content/scientific/download/index.html (extract_text="False")
extracting messages from data/content/scientific/download/scientific-download-splash.html (extract_text="False")
extracting messages from data/content/security/index.html (extract_text="False")
extracting messages from data/content/security/download/index.html (extract_text="False")
extracting messages from data/content/security/download/security-download-splash.html (extract_text="False")
extracting messages from data/templates/css.html (extract_text="False")
extracting messages from data/templates/export-regulations.html (extract_text="False")
extracting messages from data/templates/footer.html (extract_text="False")
extracting messages from data/templates/head.html (extract_text="False")
extracting messages from data/templates/js.html (extract_text="False")
extracting messages from data/templates/master.html (extract_text="False")
extracting messages from data/templates/regulations.html (extract_text="False")
extracting messages from data/templates/astronomy/header.html (extract_text="False")
extracting messages from data/templates/comp-neuro/header.html (extract_text="False")
extracting messages from data/templates/comp-neuro/supportresources.html (extract_text="False")
extracting messages from data/templates/design-suite/header.html (extract_text="False")
extracting messages from data/templates/games/header.html (extract_text="False")
extracting messages from data/templates/generic/devel.html (extract_text="False")
extracting messages from data/templates/generic/docs-links.html (extract_text="False")
extracting messages from data/templates/generic/other-media-sources.html (extract_text="False")
extracting messages from data/templates/generic/splash-checksum-unofficial.html (extract_text="False")
extracting messages from data/templates/generic/splash-checksum.html (extract_text="False")
extracting messages from data/templates/generic/unofficial.html (extract_text="False")
extracting messages from data/templates/jam/header.html (extract_text="False")
extracting messages from data/templates/python-classroom/header.html (extract_text="False")
extracting messages from data/templates/python-classroom/splash-python.html (extract_text="False")
extracting messages from data/templates/python-classroom/supportresources.html (extract_text="False")
extracting messages from data/templates/robotics/header.html (extract_text="False")
extracting messages from data/templates/scientific/header.html (extract_text="False")
extracting messages from data/templates/security/header.html (extract_text="False")
writing PO template file to po/labs.fedoraproject.org.pot
msginit -i po/labs.fedoraproject.org.pot --no-translator -l en -o po/en.po
Created po/en.po.
msgfmt -o po/en.mo po/en.po
python2.7 /srv/web/fedora-websites/labs.fedoraproject.org/../build.d/construct-translations.py /srv/web/fedora-websites/labs.fedoraproject.org/../build.d/translations.ini po/LINGUAS data/templates/translations.html
Traceback (most recent call last):
  File "/srv/web/fedora-websites/labs.fedoraproject.org/../build.d/construct-translations.py", line 4, in <module>
    import langtable
ImportError: No module named langtable
make: *** [data/templates/translations.html] Error 1

I'm not sure where you are running the build script, but there is a PR on infra side waiting to be merged
https://pagure.io/fedora-infra/ansible/pull-request/632
If you are using your own build system, you'll need to install langtable-python (or langtable via pip, depending of your system)

I'm not sure where you are running the build script

I'm not, this is a failure from the actual build. Looks like your infra PR will fix it. I've subscribed to that PR, so if there are still errors from the build after that's merged, I'll let you know. Or you can get someone who is a sponsor of the web group to add you to that group and then you'll get build failures via email.

Metadata
Changes Summary 40
+5 -2
file changed
Makefile.in
+1 -1
file changed
README.md
+1 -1
file changed
alt.fedoraproject.org/Makefile
+46 -18
file changed
alt.fedoraproject.org/data/content/alt/index.html
+16 -17
file changed
alt.fedoraproject.org/data/content/verify.html
+0 -9
file changed
alt.fedoraproject.org/data/templates/generic/splash-checksum.html
+0
file added
alt.fedoraproject.org/static/images/kde.png
+1 -1
file changed
arm.fedoraproject.org/Makefile
+487 -475
file changed
arm.fedoraproject.org/data/content/index.html
+8 -7
file changed
arm.fedoraproject.org/data/content/verify.html
+3 -0
file changed
boot.fedoraproject.org/Makefile
+3 -0
file changed
budget.fedoraproject.org/Makefile
+1 -1
file changed
build.d/buildconf.py
+3 -1
file changed
build.d/construct-translations.py
+27 -25
file changed
build.d/globalvar.py
+1 -1
file changed
fedoracommunity.org/Makefile
+3 -0
file changed
fedoraproject.org/Makefile
+3 -0
file changed
flocktofedora.org/Makefile
+45 -60
file changed
flocktofedora.org/data/content/index.html
+3 -0
file changed
getfedora.org/Makefile
+1 -1
file changed
labs.fedoraproject.org/Makefile
+1 -1
file changed
labs.fedoraproject.org/data/content/python-classroom/download/index.html
+4 -3
file changed
labs.fedoraproject.org/data/content/verify.html
+1 -1
file changed
labs.fedoraproject.org/data/templates/generic/docs-links.html
+0 -6
file changed
labs.fedoraproject.org/data/templates/generic/splash-checksum.html
+1 -1
file changed
spins.fedoraproject.org/Makefile
+1 -1
file changed
spins.fedoraproject.org/data/content/cinnamon/download/index.html
+14 -0
file changed
spins.fedoraproject.org/data/content/index.html
+2 -1
file changed
spins.fedoraproject.org/data/content/kde/download/index.html
+11 -6
file changed
spins.fedoraproject.org/data/content/kde/index.html
+3 -3
file changed
spins.fedoraproject.org/data/content/verify.html
+0 -7
file changed
spins.fedoraproject.org/data/templates/generic/splash-checksum.html
-0
file removed
spins.fedoraproject.org/static/images/kde/calligra.png
+0
file added
spins.fedoraproject.org/static/images/kde/elisa.png
+0
file added
spins.fedoraproject.org/static/images/kde/libreoffice.png
+0 -0
file changed
spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg
+3 -2
file changed
start.fedoraproject.org/Makefile
+3 -3
file changed
start.fedoraproject.org/static/css/app.css
+0 -0
file changed
start.fedoraproject.org/static/images/fedora-logo.png
+0 -0
file changed
start.fedoraproject.org/static/images/fmag-ribbon.png