Merge branch '1.0' into 1.1

* 1.0: [Translations] Updated translations from Crowdin
ezecosystem · Apr 3, 2018 · 883d383 · 883d383
2 parents 0f6d828 + 44dd9d2
commit 883d383
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/translations/messages.he.yml b/src/Sylius/Bundle/PromotionBundle/Resources/translations/messages.he.yml
@@ -17,6 +17,8 @@ sylius:
             type: סוג
         promotion_coupon_generator_instruction:
             amount: כמות
+            expires_at: תאריך תפוגה
+            usage_limit: מגבלת שימוש
         promotion_filter:
             price_range: מסנן טווח מחיר
         promotion_rule:

diff --git a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.he.yml b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.he.yml
@@ -74,6 +74,7 @@ sylius:
         company: 'חברה'
         complete: 'השלם'
         completed: 'הושלם'
+        configuration: 'הגדרות'
         confirmation: 'אישור'
         confirmation_title: 'אישור'
         countries: 'ארצות'
@@ -113,6 +114,10 @@ sylius:
         equal: 'שווה'
         error: 'שגיאה'
         exchange_rates: 'שערי החליפין'
+<<<<<<< HEAD
+=======
+        expires_at: 'תאריך תפוגה'
+>>>>>>> 1.0
         extra_information: 'מידע נוסף'
         extra_notes: 'הערות נוספות'
         failed: 'נכשל'