diff options
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/oc-dialogs.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index d661a871a5f..d6453d2d56c 100644 --- 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 |