diff --git a/downloads.php b/downloads.php
index 3eb4dd67869c9800e3c059e835d17d153354f178..918431747220cb4e22fa278e5b95cca234372a9e 100644
--- a/downloads.php
+++ b/downloads.php
@@ -8,7 +8,7 @@ $download_folder = "0.14";
$last_version = "0.14.4";
print (" <br/>\n");
print _(" Latest version of Gajim is")." <strong>".$last_version."</strong><br/>\n";
-printf(_(" A %s version is in test"), "<strong>0.15-beta1</strong>");
+printf(_(" A %s version is in test"), "<strong>0.15-beta2</strong>");
print ("<br/>\n");
print _("If your distribution doesn't have the latest version ");
print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n";
@@ -20,8 +20,8 @@ print (" </h2>\n");
print ("</a>\n");
print _(" If you use Debian unstable do")." <i>apt-get install gajim</i>\n";
print (" <br/>\n");
-printf(_(" The Debian package of %s is "), "0.15-alpha1");
-print "<a href=\"downloads/0.15/gajim_0.15~alpha1-1_all.deb\">"._("here")."</a>.<br />\n";
+printf(_(" The Debian package of %s is "), "0.15-beta2");
+print "<a href=\"downloads/0.15/gajim_0.15~beta2-1_all.deb\">"._("here")."</a>.<br />\n";
print _(" A daily package from mercurial is also built. To use it, remove gajim")." (<i>apt-get remove gajim</i>), "._("add this line to your")." /etc/apt/source.list:\n";
print (" <br/>\n");
print (" <i>deb ftp://ftp.gajim.org/debian unstable main</i>\n");
@@ -148,8 +148,8 @@ print ("</a>\n");
print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.exe\">"._("Gajim installer")."</a>.\n";
#print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n";
print (" <br/>\n");
-print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta1-1.exe\">"._("Gajim installer")."</a> ";
-printf(_("for %s version "), "0.15-beta1");
+print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta2-1.exe\">"._("Gajim installer")."</a> ";
+printf(_("for %s version "), "0.15-beta2");
print (".\n");
print (" <br/>\n");
@@ -160,8 +160,8 @@ print _(" Source\n");
print (" </h2>\n");
print ("</a>\n");
print _(" The tarball version of Gajim is ")."<a href=\"downloads/".$download_folder."/gajim-".$last_version.".tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/tip/README.html\">see the <tt>README</tt></a> ("._("in English").").<br />\n";
-printf(_(" The tarball version of %s is "), "0.15-alpha1");
-print "<a href=\"downloads/0.15/gajim-0.15-alpha1.tar.gz\">"._("here")."</a>.<br />\n";
+printf(_(" The tarball version of %s is "), "0.15-beta2");
+print "<a href=\"downloads/0.15/gajim-0.15-beta2.tar.gz\">"._("here")."</a>.<br />\n";
print _("If you want to use the last unstable development version, then you should checkout the mercurial repository.\n");
diff --git a/index.php b/index.php
index 8e3c3f5ed139e449bb2e1fe6c94458743b9a1424..5f58e01e32f99301fd95a2c8a3ddad188a130c2b 100644
--- a/index.php
+++ b/index.php
@@ -49,56 +49,68 @@ for ($i=0; $i<sizeof($array_features); $i++) {
$tpl->set_var("NEWS_MAIN", _("NEWS"));
$array_news_title = array(
- 0 => sprintf(_("Beta-release of Gajim %s"), "0.15"),
- 1 => sprintf(_("Alpha-release of Gajim %s"), "0.15"),
- 2 => sprintf(_("Gajim %s is here!"), "0.14.4"),
- 3 => sprintf(_("Gajim %s is here!"), "0.14.3"),
- 4 => sprintf(_("Gajim %s is here!"), "0.14.2"),
- 5 => sprintf(_("Gajim %s is here!"), "0.14.1"),
- 6 => sprintf(_("Gajim %s is here!"), "0.14"));
+ 0 => sprintf(_("Beta2-release of Gajim %s"), "0.15"),
+ 1 => sprintf(_("Beta-release of Gajim %s"), "0.15"),
+ 2 => sprintf(_("Alpha-release of Gajim %s"), "0.15"),
+ 3 => sprintf(_("Gajim %s is here!"), "0.14.4"),
+ 4 => sprintf(_("Gajim %s is here!"), "0.14.3"),
+ 5 => sprintf(_("Gajim %s is here!"), "0.14.2"),
+ 6 => sprintf(_("Gajim %s is here!"), "0.14.1"),
+ 7 => sprintf(_("Gajim %s is here!"), "0.14"));
// 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"),
// 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"),
// 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12"));
// 3 => sprintf(_("New windows installer")),
$array_news_date = array(
- 0 => _("17 September 2011"),
- 1 => _("27 August 2011"),
- 2 => _("22 July 2011"),
- 3 => _("19 June 2011"),
- 4 => _("07 June 2011"),
- 5 => _("26 October 2010"),
- 6 => _("02 September 2010"));
+ 0 => _("08 October 2011"),
+ 1 => _("17 September 2011"),
+ 2 => _("27 August 2011"),
+ 3 => _("22 July 2011"),
+ 4 => _("19 June 2011"),
+ 5 => _("07 June 2011"),
+ 6 => _("26 October 2010"),
+ 7 => _("02 September 2010"));
$array_news_desc = array(
0 => sprintf(_("Version %s will arrive very soon."), "0.15"),
- 1 => sprintf(_("Version %s will arrive soon."), "0.15"),
- 2 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"),
- 3 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"),
- 4 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"),
- 5 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"),
- 6 => sprintf(_("Version %s of Gajim has been released."), "0.14"));
+ 1 => sprintf(_("Version %s will arrive very soon."), "0.15"),
+ 2 => sprintf(_("Version %s will arrive soon."), "0.15"),
+ 3 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"),
+ 4 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"),
+ 5 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"),
+ 6 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"),
+ 7 => sprintf(_("Version %s of Gajim has been released."), "0.14"));
// 6 => sprintf(_("Version %s will arrive very soon."), "0.12"),
// 7 => sprintf(_("Version %s will arrive soon."), "0.12"));
// 3 => sprintf(_("New Windows Installer with GTK+ included.")),
$array_news_whats_new = array(
- 0 => sprintf(_("What's new since %s:"), "0.15-alpha1"),
- 1 => sprintf(_("What's new since %s:"), "0.14.4"),
- 2 => sprintf(_("What's new since %s:"), "0.14.3"),
- 3 => sprintf(_("What's new since %s:"), "0.14.2"),
- 4 => sprintf(_("What's new since %s:"), "0.14.1"),
- 5 => sprintf(_("What's new since %s:"), "0.14"),
- 6 => sprintf(_("What's new since %s:"), "0.13.4"));
+ 0 => sprintf(_("What's new since %s:"), "0.15-beta1"),
+ 1 => sprintf(_("What's new since %s:"), "0.15-alpha1"),
+ 2 => sprintf(_("What's new since %s:"), "0.14.4"),
+ 3 => sprintf(_("What's new since %s:"), "0.14.3"),
+ 4 => sprintf(_("What's new since %s:"), "0.14.2"),
+ 5 => sprintf(_("What's new since %s:"), "0.14.1"),
+ 6 => sprintf(_("What's new since %s:"), "0.14"),
+ 7 => sprintf(_("What's new since %s:"), "0.13.4"));
// 3 => sprintf(_("What's new in it:")),
$array_news_items[0] = array(
+ 0 => _("Fix End to End encryption."),
+ 1 => _("Fix auto-opening chat window when a contact connects."),
+ 2 => _("Fix registering a new account."),
+ 3 => _("Fix In Bad Bytestream."),
+ 4 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/d687f2253f17/ChangeLog\">"._("Full ChangeLog")."</a> ",
+ );
+
+$array_news_items[1] = array(
0 => _("Plugins are now translatable"),
1 => _("Workarround a D-Bus issue with non-character unicode"),
2 => _("Fix windows usage when GTK library is already in PATH"),
3 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/41dd6ee4817d/ChangeLog\">"._("Full ChangeLog")."</a> ",
);
-$array_news_items[1] = array(
+$array_news_items[2] = array(
0 => _("Plugin system"),
1 => _("Whiteboard (via a plugin)"),
2 => _("Message archiving"),
@@ -109,32 +121,32 @@ $array_news_items[1] = array(
7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15\">"._("List of fixed bugs")."</a>",
);
-$array_news_items[2] = array(
+$array_news_items[3] = array(
0 => _("Fix translation issue"),
1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/9476e66272c3/ChangeLog\">"._("Full ChangeLog")."</a> ",
2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.4\">"._("List of fixed bugs")."</a>",
);
-$array_news_items[3] = array(
+$array_news_items[4] = array(
0 => _("Fix history viewer"),
1 => _("Fix closing roster window"),
2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/7798a90157c7/ChangeLog\">"._("Full ChangeLog")."</a> ",
3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.3\">"._("List of fixed bugs")."</a>",
);
-$array_news_items[4] = array(
+$array_news_items[5] = array(
0 => _("Fix CPU usage when testing file transfer proxies"),
1 => _("Fix invalid XML char regex"),
2 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/baf4786b33fe/ChangeLog\">"._("Full ChangeLog")."</a> ",
3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.2\">"._("List of fixed bugs")."</a>",
);
-$array_news_items[5] = array(
+$array_news_items[6] = array(
0 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/d56f061aca8d/ChangeLog\">"._("Full ChangeLog")."</a> ",
1 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.1\">"._("List of fixed bugs")."</a>",
);
-$array_news_items[6] = array(
+$array_news_items[7] = array(
0 => _("Jingle audio / video chat"),
1 => _("Improve startup time"),
2 => _("Groupchat auto-rejoin"),