Skip to content

Commit

Permalink
Merge upstream changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Guo Yunhe committed Jul 24, 2017
2 parents fdf796d + 0d399cc commit af22e9c
Show file tree
Hide file tree
Showing 12 changed files with 1,058 additions and 3,248 deletions.
82 changes: 82 additions & 0 deletions app/views/distributions/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
</div>
</header>

<<<<<<< HEAD
<div class="container mb-5">
<div class="card-deck">
<div class="card">
Expand Down Expand Up @@ -43,6 +44,87 @@
</div>
</div><!-- /.card-deck -->
</div><!-- /.container -->
=======
<div class="container" role="main">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<table>
<thead>
<tr>
<th>
<%= link_to(tumbleweed_distributions_path) do %>
<%= image_tag('jekyll/Tumbleweed-green.png', alt: "Tumbleweed Logo") %>
<% end %>
<%= link_to 'Tumbleweed', tumbleweed_distributions_path %>
</th>
<th>
<%= link_to(leap_distributions_path) do %>
<%= image_tag('jekyll/Leap-green.png', alt: "Leap Logo") %>
<% end %>
<%= link_to 'Leap', leap_distributions_path %>
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<%= _('Download openSUSE’s rolling release and always run the latest packages provided by the openSUSE Project.') %>
</td>
<td>
<%= _('Download openSUSE’s regular release and enjoy the benefits of both enterprise-grade engineering and community-developed innovation.') %>
</td>
</tr>
</tbody>
</table>

<hr>

<% if false %>
<table>
<thead>
<tr>
<th>
<%= link_to 'Testing', testing_distributions_path %>
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<%= _('Help test openSUSE’s next version of Leap by downloading
the latest development milestone.') %>
</td>
</tr>
</tbody>
</table>
<% end %>

<hr>

<h2 id="choosing-which-distribution-to-download">
<%= _('Choosing which Distribution to Download') %>
</h2>
<p>
<%= _('%{tumbleweed} is a <strong>rolling-release</strong>. This means the software is always the latest stable versions available from the openSUSE Project. Things will change regularly as Free and Open Source projects continually release new versions of their software.') % { tumbleweed: link_to(_('openSUSE Tumbleweed'), tumbleweed_distributions_path) } %>
<br>
<%= _('Tumbleweed is recommended for <strong>Developers</strong>, <strong>openSUSE Contributors</strong>, and <strong>Linux/FOSS Enthusiasts</strong>.') %>
</p>

<p>
<%= _('%{leap} is a <strong>regular-release</strong>. This means it releases %{annually}, with security and stability updates being the priority during each release %{lifetime}.') %
{ leap: link_to(_('openSUSE Leap'), leap_distributions_path),
annually: link_to(_('annually'), _('https://en.opensuse.org/openSUSE:Roadmap')),
lifetime: link_to(_('lifetime'), _("https://en.opensuse.org/Lifetime"))
} %>
<%= _('It is not expected to change in any significant way until its next annual release.') %>
<br />
<%= _('Leap shares a Common Base System with %{sles}, so major architectural changes are not expected for several years, aligned with each new Major Release (eg 12, 13, etc) of SUSE Linux Enterprise.') % {
sles: link_to(_('SUSE Linux Enterprise'), "https://www.suse.com/products/server/")
} %>
<br />
<%= _('Leap is recommended for <strong>Sysadmins</strong>, <strong>Enterprise Developers</strong>, and <strong>‘Regular’ Desktop Users</strong>.') %>
</p>
>>>>>>> 0d399cc20dc0aebd59b740a94bad584182a9ae50

<section class="mb-4">
<div class="container">
Expand Down
20 changes: 20 additions & 0 deletions app/views/layouts/_piwik.html.erb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
(function(){
var u=(("https:" == document.location.protocol) ? "https://beans.opensuse.org/piwik/" : "http://beans.opensuse.org/piwik/");
_paq.push(['setSiteId', 7]);
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['trackPageView']);
_paq.push([ 'setDomains', ["*.opensuse.org"]]);
var d=document,
g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
g.type='text/javascript';
g.defer=true;
g.async=true;
g.src=u+'piwik.js';
s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Piwik Code -->
1 change: 1 addition & 0 deletions app/views/layouts/jekyll.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<%= yield %>
<%= render(:partial => "layouts/footer") %>
<%= render(:partial => "layouts/piwik") %>

<script src="//cdn.jsdelivr.net/jquery/1.12.4/jquery.min.js"></script>
<script src="//cdn.jsdelivr.net/bootstrap/3.3.2/js/bootstrap.min.js"></script>
Expand Down
26 changes: 19 additions & 7 deletions locale/cs/software.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-19 12:32+0200\n"
"PO-Revision-Date: 2017-06-23 14:31+0000\n"
"Last-Translator: Tomáš Chvátal <tchvatal@suse.com>\n"
"PO-Revision-Date: 2017-07-23 18:02+0000\n"
"Last-Translator: Aleš Kastner <alkas@volny.cz>\n"
"Language-Team: Czech "
"<https://l10n.opensuse.org/projects/software-o-o/master/cs/>\n"
"Language: cs\n"
Expand All @@ -28,6 +28,9 @@ msgid ""
"%{annually}, with security and stability updates being the priority during "
"each release %{lifetime}."
msgstr ""
"%{leap} je <strong>pravidelné vydávání</strong>. To znamená, že se vydává "
"%{annually} a během %{lifetime} každého vydání se přednostně provádějí "
"bezpečnostní a stabilizační aktualizace."

#: ../app/views/distributions/index.html.erb:77
msgid ""
Expand All @@ -36,6 +39,10 @@ msgid ""
"Things will change regularly as Free and Open Source projects continually "
"release new versions of their software."
msgstr ""
"%{tumbleweed} je <strong>rolující vydání</strong>. To znamená, že software "
"má vždy nejnovější stabilní verze dostupné v projektu openSUSE. Bude "
"docházet k pravidelným změnám, protože projekty Free a Open Source neustále "
"uvolňují nové verzie svého softwaru."

#: ../app/views/download/package.erb:6 ../app/views/download/appliance.erb:6
msgid "(hide)"
Expand All @@ -47,11 +54,11 @@ msgstr "(zobrazit)"

#: ../app/views/distributions/_requirements.html.erb:6
msgid "2 GB system memory"
msgstr ""
msgstr "2 GB systémové paměti"

#: ../app/views/distributions/_requirements.html.erb:5
msgid "2 Ghz dual core processor or better"
msgstr ""
msgstr "Dvoujádrový procesor 2 GHz, nebo lepší"

#: ../app/views/package/_download_rows.html.erb:4
msgid "<b>official release</b>"
Expand All @@ -78,13 +85,18 @@ msgid ""
"Both distributions are fully capable of being used on a Desktop PC, laptop, "
"server, or in the cloud."
msgstr ""
"Obě distribuce jsou plně použitelné na stolním PC, notebooku, serveru nebo v "
"cloudu."

#: ../app/views/distributions/index.html.erb:98
msgid ""
"Both distributions are well tested by <a href=\"https://openqa.opensuse.org"
"\">openQA</a> as well as by human openSUSE contributors so both can be "
"relied upon to work."
msgstr ""
"Obě distribuce jsou dobře testovány s <a href=\"https://openqa.opensuse.org\""
">openQA</a> i s přispěvateli openSUSE, takže se lze spolehnout, že budou obě "
"funkční."

#: ../app/views/package/show.html.erb:169
msgid "Categories"
Expand All @@ -109,15 +121,15 @@ msgstr "Kontrolní součet"

#: ../app/views/distributions/_verify_download.html.erb:23
msgid "Checksums Help"
msgstr ""
msgstr "Pomocník pro kontrolní součty"

#: ../app/views/distributions/_choosing_media.html.erb:2
msgid "Choosing Which Media to Download"
msgstr "Výběr média ke stažení"

#: ../app/views/distributions/index.html.erb:74
msgid "Choosing which Distribution to Download"
msgstr ""
msgstr "Výběr distribuce ke stažení"

#: ../app/views/layouts/application.html.erb:65
#: ../app/views/layouts/download.html.erb:59
Expand All @@ -126,7 +138,7 @@ msgstr "Komunita"

#: ../app/views/distributions/testing.html.erb:34
msgid "Currently testing %{leap_beta}"
msgstr ""
msgstr "Právě testuji %{leap_beta}"

#: ../app/views/distributions/index.html.erb:117
msgid "Derivatives"
Expand Down
11 changes: 5 additions & 6 deletions locale/da/software.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: version 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-19 12:32+0200\n"
"PO-Revision-Date: 2017-06-22 13:11+0000\n"
"PO-Revision-Date: 2017-07-19 23:05+0000\n"
"Last-Translator: scootergrisen Required Fields <scootergrisen@gmail.com>\n"
"Language-Team: Danish "
"<https://l10n.opensuse.org/projects/software-o-o/master/da/>\n"
Expand Down Expand Up @@ -455,8 +455,7 @@ msgstr "Installationsmedie"

#: ../app/views/distributions/_requirements.html.erb:9
msgid "Internet access is helpful, and required for the Network Installer"
msgstr ""
"Internetadgang er hjælpsom og krævet ved netværksinstallationsprogrammet"
msgstr "Internetadgang er nyttig og kræves af netværksinstallationsprogrammet"

#: ../app/views/distributions/index.html.erb:108
msgid ""
Expand Down Expand Up @@ -804,7 +803,7 @@ msgstr ""

#: ../app/views/distributions/_unsupported_live_media.html.erb:2
msgid "Unsupported LiveUSBs"
msgstr "Ikke-understøttet LiveUSB'er"
msgstr "LiveUSB'er uden support"

#: ../app/views/package/show.html.erb:239
msgid "Unsupported distributions:"
Expand All @@ -816,7 +815,7 @@ msgstr "Opgraderingsinstruktioner"

#: ../app/views/distributions/_verify_download.html.erb:2
msgid "Verify Your Download Before Use"
msgstr "Verificér dit download før brug"
msgstr "Verificér din download inden brug"

#: ../app/views/package/show.html.erb:190
msgid "Version"
Expand Down Expand Up @@ -944,7 +943,7 @@ msgstr ""

#: ../app/views/distributions/index.html.erb:10
msgid "openSUSE is completely free to download, use and share."
msgstr "openSUSE er fuldstændigt gratis at downloade, bruge og dele."
msgstr "openSUSE er helt gratis at downloade, bruge og dele."

#~ msgid "Please review %{openqa}"
#~ msgstr "Gennemgå venligst %{openqa}"
Expand Down
16 changes: 8 additions & 8 deletions locale/es/software.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ msgstr ""
"Project-Id-Version: software-opensuse-org\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-19 12:32+0200\n"
"PO-Revision-Date: 2017-06-26 15:38+0000\n"
"Last-Translator: Victor hck <correohck@gmail.com>\n"
"PO-Revision-Date: 2017-07-04 18:55+0000\n"
"Last-Translator: jc sl <trcs@gmx.com>\n"
"Language-Team: Spanish "
"<https://l10n.opensuse.org/projects/software-o-o/master/es/>\n"
"Language: es\n"
Expand Down Expand Up @@ -44,12 +44,12 @@ msgid ""
"Things will change regularly as Free and Open Source projects continually "
"release new versions of their software."
msgstr ""
"%{tumbleweed} es de <strong>actualización contínua</strong>. Esto significa "
"%{tumbleweed} es de <strong>actualización continua</strong>. Esto significa "
"que el software estará siempre\n"
"a la última con versiones estables disponibles por el proyecto openSUSE. "
"Habrá cosas\n"
"que cambien con regularidad ya que los proyectos de software libre y código "
"abierto contínuamente\n"
"abierto continuamente\n"
"publican nuevas versiones de software."

#: ../app/views/download/package.erb:6 ../app/views/download/appliance.erb:6
Expand Down Expand Up @@ -250,7 +250,7 @@ msgid ""
"Download openSUSE’s rolling release and always run the latest packages "
"provided by the openSUSE Project."
msgstr ""
"Descargar la versión de actualización contínua de openSUSE y ejecute siempre "
"Descargar la versión de actualización continua de openSUSE y ejecute siempre "
"las versiones más modernas de los paquetes de software ofrecidos por el "
"proyecto openSUSE."

Expand All @@ -260,7 +260,7 @@ msgid ""
"laptops, and servers."
msgstr ""
"Descargar la versión \"live\" para USB de la versión de actualización "
"contínua de openSUSE, para equipos de escritorio, portátiles y servidores."
"continua de openSUSE, para equipos de escritorio, portátiles y servidores."

#: ../app/views/distributions/leap.html.erb:10
msgid ""
Expand Down Expand Up @@ -595,7 +595,7 @@ msgstr "No se han encontrado paquetes que coincidan con su búsqueda. "

#: ../app/views/distributions/tumbleweed_unsupported.html.erb:36
msgid "Not Tested|Tumbleweed installation media"
msgstr "No hay medio de instalación comprobado de Tumbleweed"
msgstr "No comprobado|Medio de instalación de Tumbleweed"

#: ../app/controllers/application_controller.rb:55
msgid "OBS Backend not available"
Expand Down Expand Up @@ -840,7 +840,7 @@ msgid ""
"Contributors</strong>, and <strong>Linux/FOSS Enthusiasts</strong>."
msgstr ""
"Tumbleweed está recomendada para <strong>desarrolladores</strong>, <strong>"
"contribuidores de openSUSE</strong>, y <strong>entusiastas de Linux y del "
"colaboradores de openSUSE</strong>, y <strong>entusiastas de Linux y del "
"software de código libre y abierto</strong>."

#: ../app/views/distributions/_unsupported_live_media.html.erb:2
Expand Down
Loading

0 comments on commit af22e9c

Please sign in to comment.