use n to translate title

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index d661a871a5ff92caad6ba894636e112c7b63efcc..d6453d2d56c998f07c16fbcf9385c37f775240d4 100644 (file)
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -342,7 +342,13 @@ var OCdialogs = {
                                var conflicts = $(dialog_id+ ' .conflicts');
                                addConflict(conflicts, original, replacement);
 
-                               var title = t('files','{count} file conflicts',{count:$(dialog_id+ ' .conflict').length});
+                               var count = $(dialog_id+ ' .conflict').length;
+                               var title = n('files',
+                                                               'One file conflict',
+                                                               '{count} file conflicts',
+                                                               count,
+                                                               {count:count}
+                                                       );
                                $(dialog_id).parent().children('.oc-dialog-title').text(title);
 
                                //recalculate dimensions