Squashed commit of pull request #1990

commit 4eb3ff55ba964fde84f4ac98c7304b2b883f03e1
Merge: ddb3fea a04b005
Author: Brian R. Becker <[email protected]>
Date:   Sat Jul 11 20:45:30 2015 -0700

    Merge remote-tracking branch 'upstream/master'

commit ddb3fea0d994794375bd3a71a417240b27cb9d09
Author: Brian R. Becker <[email protected]>
Date:   Mon Jun 22 11:36:58 2015 -0700

    Corrected spelling in GUI message

AUTHORS

@@ -12,6 +12,7 @@ Ben Schulz <[email protected]> <[email protected]>
 Ben Sidhom <[email protected]>
 Brandon Philips <[email protected]>
 Brendan Long <[email protected]>
+Brian R. Becker <[email protected]>
 Caleb Callaway <[email protected]>
 Carsten Hagemann <[email protected]>
 Cathryne Linenweaver <[email protected]> <[email protected]>

NICKS

@@ -14,6 +14,7 @@ andrew-d	<[email protected]>
 asdil12		<[email protected]>
 bencurthoys	<[email protected]>
 bigbear2nd	<[email protected]>
+brbecker	<[email protected]>
 brendanlong	<[email protected]>
 brgmnn      <[email protected]> <[email protected]>
 bsidhom		<[email protected]>

gui/assets/lang/lang-en.json

@@ -170,6 +170,7 @@
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "The first command line parameter is the folder path and the second parameter is the relative path in the folder.",
    "The folder ID cannot be blank.": "The folder ID cannot be blank.",
    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
+   "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscore (_) characters only.": "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscore (_) characters only.",
    "The folder ID must be unique.": "The folder ID must be unique.",
    "The folder path cannot be blank.": "The folder path cannot be blank.",
    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.",

gui/index.html

@@ -645,7 +645,7 @@
                     <span translate ng-if="folderEditor.folderID.$valid || folderEditor.folderID.$pristine">Short identifier for the folder. Must be the same on all cluster devices.</span>
                     <span translate ng-if="folderEditor.folderID.$error.uniqueFolder">The folder ID must be unique.</span>
                     <span translate ng-if="folderEditor.folderID.$error.required && folderEditor.folderID.$dirty">The folder ID cannot be blank.</span>
-                    <span translate ng-if="folderEditor.folderID.$error.pattern && folderEditor.folderID.$dirty">The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.</span>
+                    <span translate ng-if="folderEditor.folderID.$error.pattern && folderEditor.folderID.$dirty">The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscore (_) characters only.</span>
                   </p>
                 </div>
                 <div class="form-group" ng-class="{'has-error': folderEditor.folderPath.$invalid && folderEditor.folderPath.$dirty}">
@@ -1090,6 +1090,7 @@
           <li class="auto-generated">Ben Sidhom</li>
           <li class="auto-generated">Brandon Philips</li>
           <li class="auto-generated">Brendan Long</li>
+          <li class="auto-generated">Brian R. Becker</li>
           <li class="auto-generated">Caleb Callaway</li>
           <li class="auto-generated">Carsten Hagemann</li>
           <li class="auto-generated">Cathryne Linenweaver</li>