Commit a2a7bd16 authored by Philipp Hörist's avatar Philipp Hörist

Merge branch 'download-fixes' into 'master'

Download fixes

Closes #19, #17, and #18

See merge request !12
parents 8a0b6ec0 77f96fe2
......@@ -25,8 +25,8 @@ $os_table = array(
),
1 => array (
"archlinux",
"Archlinux",
"Archlinux",
"Arch Linux",
"Arch Linux",
),
2 => array (
"debian",
......@@ -125,19 +125,21 @@ print "</div>\n";
#2)Archlinux
print "<div id='archlinux'>\n";
print "<h2>Archlinux:</h2>\n";
print "<h2>Arch Linux:</h2>\n";
print _("Just")." <i>pacman -S gajim</i>\n";
print "</div>\n";
#3)Debian GNU/Linux
print "<div id='debian'>\n";
print "<h2>Debian GNU/Linux:</h2>\n";
print _("Just")." <i>sudo apt-get install gajim</i>\n";
print _("To install from the official Debian repositories, just do:");
print (" <br/>\n");
print " <i>sudo apt-get install gajim</i>\n";
print (" <br/>\n");
print (" <br/>\n");
#printf(_(" The Debian package of %s is available on our Debian repository. Follow below steps to use it, then install gajim with <i>sudo apt-get install gajim</i>"), "1.1.0-beta2");
#print (" <br/>\n");
print _(" A daily package from git is also built. To use it, you need to use unstable repository (or at least backports). Then follow these steps:");
printf(_(" A daily package from git is also built. To use it, you need to use unstable repository (or at least %sbackports%s). Then follow these steps:"), "<a href='https://backports.debian.org/Instructions/'>", "</a>");
print " <br/>\n";
print _("Remove Gajim:");
print " <br/>\n";
......@@ -145,7 +147,7 @@ print " <i>sudo apt-get remove gajim</i>";
print " <br/>\n";
print _("Add the GPG key:");
print " <br/>\n";
print " <i>wget -q https://gajim.org/gajim.key -O - | apt-key add -</i>";
print " <i>wget -q https://gajim.org/gajim.key -O - | sudo apt-key add -</i>";
print " <br/>\n";
print _("Add the repository:");
print " <br/>\n";
......@@ -229,7 +231,7 @@ print "<h2>Ubuntu:</h2>\n";
print _("Just")." <i>sudo apt-get install gajim</i>\n";
print ("<br/>\n");
print (" <br/>\n");
print _(" A daily package from git is also built. To use it:");
print _(" A daily package from git is also built. To use it, you need at least Ubuntu 18.04 ('bionic'):");
print " <br/>\n";
print _("Remove Gajim:");
print " <br/>\n";
......@@ -237,7 +239,7 @@ print " <i>sudo apt-get remove gajim</i>";
print " <br/>\n";
print _("Add the GPG key:");
print " <br/>\n";
print " <i>wget -q https://gajim.org/gajim.key -O - | apt-key add -</i>";
print " <i>wget -q https://gajim.org/gajim.key -O - | sudo apt-key add -</i>";
print " <br/>\n";
print _("Add the repository:");
print " <br/>\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment