From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 04 May 2016 07:27:53 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/lib/lang/ca_language_complete.lng |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/lib/lang/ca_language_complete.lng b/interface/web/admin/lib/lang/ca_language_complete.lng
new file mode 100644
index 0000000..1543877
--- /dev/null
+++ b/interface/web/admin/lib/lang/ca_language_complete.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'Merge language';
+$wb["list_desc_txt"] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
+$wb["language_select_txt"] = 'Select language';
+$wb['btn_save_txt'] = 'Merge files now';
+$wb['btn_cancel_txt'] = 'Back';
+?>
\ No newline at end of file

--
Gitblit v1.9.1