release: merge back stable branch into default

2017-02-05 22:12:47 +01:00 · 2017-02-05 22:12:47 +01:00 · b79e658a19
commit b79e658a19
parent 19e8cae7a5 2b13321f2a
22 changed files with 25545 additions and 23516 deletions
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@ -185,7 +185,7 @@
    };
  };
  Pylons = super.buildPythonPackage {
-    name = "Pylons-1.0.2.dev20161213";
+    name = "Pylons-1.0.2.dev20170205";
    buildInputs = with self; [];
    doCheck = false;
    propagatedBuildInputs = with self; [Routes WebHelpers Beaker Paste PasteDeploy PasteScript FormEncode simplejson decorator nose Mako WebError WebTest Tempita MarkupSafe WebOb];
--- a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/rhodecode.pot
+++ b/rhodecode/i18n/rhodecode.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rhodecode-enterprise-ce 4.6.0\n"
 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
-"POT-Creation-Date: 2017-02-01 21:09+0100\n"
+"POT-Creation-Date: 2017-02-05 18:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po