diff options
| -rw-r--r-- | apps/files/templates/fileexists.html | 4 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html index 662177ac7ed..79beccef3e5 100644 --- a/apps/files/templates/fileexists.html +++ b/apps/files/templates/fileexists.html @@ -3,8 +3,8 @@ <span class="what">{what}<!-- If you select both versions, the copied file will have a number added to its name. --></span><br/> <br/> <table> - <th><label><input class="allnewfiles" type="checkbox" />New Files<span class="count"></span></label></th> - <th><label><input class="allexistingfiles" type="checkbox" />Already existing files<span class="count"></span></label></th> + <th><label><input class="allnewfiles" type="checkbox" />{allnewfiles}<span class="count"></span></label></th> + <th><label><input class="allexistingfiles" type="checkbox" />{allexistingfiles}<span class="count"></span></label></th> </table> <div class="conflicts"> <div class="template"> diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 6fc8d4d3523..617a8a3152c 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -364,6 +364,9 @@ var OCdialogs = { title: title, type: 'fileexists', + allnewfiles: t('files','New Files'), + allexistingfiles: t('files','Already existing files'), + why: t('files','Which files do you want to keep?'), what: t('files','If you select both versions, the copied file will have a number added to its name.') }); |