release: merge back stable branch into default

pkgs/python-packages.nix

@@ -185,7 +185,7 @@
     };
   };
   Pylons = super.buildPythonPackage {
-    name = "Pylons-1.0.2.dev20170630";
+    name = "Pylons-1.0.2.dev20171106";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [Routes WebHelpers Beaker Paste PasteDeploy PasteScript FormEncode simplejson decorator nose Mako WebError WebTest Tempita MarkupSafe WebOb];

rhodecode/i18n/rhodecode.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rhodecode-enterprise-ce 4.10.0\n"
 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
-"POT-Creation-Date: 2017-11-03 16:42+0100\n"
+"POT-Creation-Date: 2017-11-06 12:44+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"

rhodecode/public/js/rhodecode/i18n/fr.js

@@ -22,7 +22,7 @@ var _TM = {
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
-    'Lifetime': 'Lifetime',
+    'Lifetime': 'Durée de vie',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -77,7 +77,7 @@ var _TM = {
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'Désactivé',
-    'enabled': 'enabled',
+    'enabled': 'Activé',
     'file': 'file',
     'files': 'Fichiers',
     'in {0}': 'in {0}',
@@ -89,7 +89,7 @@ var _TM = {
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
-    'specify commit': 'specify commit',
+    'specify commit': 'Spécifier un commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} active out of {1} users': '{0} active out of {1} users',
@@ -97,17 +97,17 @@ var _TM = {
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
-    '{0} days': '{0} days',
+    '{0} days': '{0} jours',
     '{0} hour': '{0} hour',
-    '{0} hours': '{0} hours',
+    '{0} hours': '{0} heures',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
-    '{0} months': '{0} months',
+    '{0} months': '{0} mois',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} year': '{0} year',
-    '{0} years': '{0} years',
+    '{0} years': '{0} années',
     '{0}, {1} ago': '{0}, {1} ago'
 };