[Pkg-owncloud-commits] [owncloud] 56/85: Fix copy conflict dialog translation

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit b2fae8a8b783b72717606f5476487c320e24b636
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Mon Apr 7 11:46:47 2014 +0200

    Fix copy conflict dialog translation
    
    backport of fileexist template translations
    with minor fixes
---
 apps/files/templates/fileexists.html | 4 ++--
 core/js/oc-dialogs.js                | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html
index 662177a..79becce 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 f4e3ec0..5469b80 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -358,14 +358,17 @@ var OCdialogs = {
 				//create dialog
 				this._fileexistsshown = true;
 				$.when(this._getFileExistsTemplate()).then(function($tmpl) {
-					var title = t('files','One file conflict');
+					var title = t('core','One file conflict');
 					var $dlg = $tmpl.octemplate({
 						dialog_name: dialog_name,
 						title: title,
 						type: 'fileexists',
 
-						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.')
+						allnewfiles: t('core','New Files'),
+						allexistingfiles: t('core','Already existing files'),
+
+						why: t('core','Which files do you want to keep?'),
+						what: t('core','If you select both versions, the copied file will have a number added to its name.')
 					});
 					$('body').append($dlg);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git