summaryrefslogtreecommitdiffstats
path: root/core/l10n/ta_LK.php
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-10-02 18:23:59 +0200
committerBart Visscher <bartv@thisnet.nl>2013-10-02 18:23:59 +0200
commita90ea2c069998d378ec49825ce53b7651a459c1a (patch)
tree7b1afe4ef7dd5509f25c4be7829aa6834877a979 /core/l10n/ta_LK.php
parent5db98aadd30b9f1218dda8f836acca0062ce1d9f (diff)
parent551e80979046358b9cbc8a0f8db0ff9cdf919e33 (diff)
downloadnextcloud-server-a90ea2c069998d378ec49825ce53b7651a459c1a.tar.gz
nextcloud-server-a90ea2c069998d378ec49825ce53b7651a459c1a.zip
Merge remote-tracking branch 'origin/master' into setup
Diffstat (limited to 'core/l10n/ta_LK.php')
-rw-r--r--core/l10n/ta_LK.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index a1a286275eb..43c7f451e49 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -43,6 +43,8 @@ $TRANSLATIONS = array(
"Yes" => "ஆம்",
"No" => "இல்லை",
"Ok" => "சரி",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "இரத்து செய்க",
"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
"Error" => "வழு",
"The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.",