perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui: "versioner" -> "versioning" and add missing translations

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4435
This commit is contained in:
Simon Frei
2017-10-20 13:55:22 +00:00
committed by Jakob Borg
parent dfad6a2aa9
commit c704ba9ef9
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/default/syncthing/folder/editFolderModalView.html
View File

@@ -180,7 +180,7 @@
<label translate for="externalCommand">Command</label>
<input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder.externalCommand" required="" aria-required="true" />
<p class="help-block">
<span translate ng-if="folderEditor.externalCommand.$valid || folderEditor.externalCommand.$pristine">See external versioner help for supported templated command line parameters.</span>
<span translate ng-if="folderEditor.externalCommand.$valid || folderEditor.externalCommand.$pristine">See external versioning help for supported templated command line parameters.</span>
<span translate ng-if="folderEditor.externalCommand.$error.required && folderEditor.externalCommand.$dirty">The path cannot be blank.</span>
</p>
</div>

2
gui/default/syncthing/settings/settingsModalView.html
View File

@@ -142,7 +142,7 @@
<div ng-if="tmpOptions.upgrades != 'candidate'">
<label translate for="urVersion">Anonymous Usage Reporting</label> (<a href="" translate data-toggle="modal" data-target="#urPreview">Preview</a>)
<select class="form-control" id="urVersion" ng-model="tmpOptions._urAcceptedStr">
<option ng-repeat="n in urVersions()" value="{{n}}">Version {{n}}</option>
<option ng-repeat="n in urVersions()" value="{{n}}">{{'Version' | translate}} {{n}}</option>
<!-- 1 does not exist, as we did not support incremental formats back then. -->
<option value="0" translate>Undecided (will prompt)</option>
<option value="-1" translate>Disabled</option>

2
gui/default/syncthing/usagereport/usageReportModalView.html
View File

@@ -1,7 +1,7 @@
<modal id="ur" status="info" icon="bar-chart" heading="{{'Allow Anonymous Usage Reporting?' | translate}}" large="yes" closeable="no">
<div class="modal-body">
<div ng-if="config.options.urAccepted > 0 && config.options.urAccepted < system.urVersionMax">
<p>Anonymous Usage report format has changed. Would you like to move to the new format?</p>
<p translate>Anonymous usage report format has changed. Would you like to move to the new format?</p>
</div>
<div ng-if="!(config.options.urAccepted > 0 && config.options.urAccepted < system.urVersionMax)">
<p translate>The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.</p>

4
gui/default/syncthing/usagereport/usageReportPreviewModalView.html
View File

@@ -7,8 +7,8 @@
<p><a href="https://data.syncthing.net/" target="_blank">https://data.syncthing.net/</a></p>
<label translate>Version</label>
<select id="urPreviewVersion" class="form-control" ng-model="$parent.$parent.reportDataPreviewVersion" ng-change="refreshReportDataPreview()" >
<option selected value>Select a version</option>
<option ng-repeat="n in urVersions()" value="{{n}}">Version {{n}}</option>
<option selected value translate>Select a version</option>
<option ng-repeat="n in urVersions()" value="{{n}}">{{'Version' | translate}} {{n}}</option>
</select>
<div class="checkbox" ng-if="$parent.$parent.reportDataPreviewVersion > 2">
<label>