mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix copy conflict dialog translation

This commit is contained in:
Jörn Friedrich Dreyer 2014-04-07 11:46:47 +02:00
parent 0c444fb2fb
commit c90b0ac00b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/templates/fileexists.html
View File

@ -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">

3
core/js/oc-dialogs.js
View File

@ -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.')
});