From 078bf0df2583a8a93f2fe8df15cf29f14c4ee02b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 19 Sep 2013 12:05:30 +0200
Subject: [PATCH] use {count} instead of 'One' for more versatile translation

---
 core/js/oc-dialogs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index d6453d2d56..ac37b109e7 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -344,7 +344,7 @@ var OCdialogs = {
 
 				var count = $(dialog_id+ ' .conflict').length;
 				var title = n('files',
-								'One file conflict',
+								'{count} file conflict',
 								'{count} file conflicts',
 								count,
 								{count:count}
-- 
GitLab