Merge branch 'marketplace' into register-i18n-components

* marketplace: Fix for errors while viewing orders made with Braintree (#2659) Fix translation issues on PDP and RTL placement for Tooltips (#2642) # Conflicts: # imports/plugins/core/ui/client/components/divider/divider.js
reactioncommerce · Aug 15, 2017 · cf4bc7b · cf4bc7b
2 parents 8dd6b58 + fb22db8
commit cf4bc7b
Show file tree

Hide file tree

Showing 106 changed files with 701 additions and 9,727 deletions.
diff --git a/imports/plugins/core/accounts/server/i18n/ar.json b/imports/plugins/core/accounts/server/i18n/ar.json
@@ -10,13 +10,19 @@
           "accountsDescription": "إعدادت الحساب"
         },
         "settings": {
+          "continue": "استمر",
+          "cancel": "إلغاء",
+          "changeOwner": "تغير المالك",
+          "changeShopOwnerWarn": "أنت على وشك تغيير مالك المحل. سيتم استبدال المالك الحالي",
+          "changeMktOwnerWarn": "أنت على وشك تغيير مالك ماركتبليس. سيتم استبدال المالك الحالي",
           "accountsSettingsLabel": "الحسابات",
           "accountsSettingsTitle": "الحسابات",
           "accountsSettingsDescription": "إعدادت الحساب"
         },
         "groupsInvite": {
           "name": "جون سميث",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "لا يمكنك دعوة مستخدم بشكل مباشر كمالك. الترويج للمشرف الحالي"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/bg.json b/imports/plugins/core/accounts/server/i18n/bg.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Настройки на профила"
         },
         "settings": {
+          "continue": "Продължавам",
+          "cancel": "Отмени",
+          "changeOwner": "Промяна на собственика",
+          "changeShopOwnerWarn": "На път сте да промените собственика на магазина. Сегашният собственик ще бъде заменен",
+          "changeMktOwnerWarn": "На път сте да промените собственика на Marketplace. Сегашният собственик ще бъде заменен",
           "accountsSettingsLabel": "Профили",
           "accountsSettingsTitle": "Профили",
           "accountsSettingsDescription": "Настройки на профила"
         },
         "groupsInvite": {
           "name": "Джон Смит",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Не можете директно да каните потребител като собственик. Насърчаване на съществуващ администратор"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/cs.json b/imports/plugins/core/accounts/server/i18n/cs.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Nastavení účtu"
         },
         "settings": {
+          "continue": "Pokračovat",
+          "cancel": "Zrušit",
+          "changeOwner": "Změnit majitele",
+          "changeShopOwnerWarn": "Chystáte se změnit majitele obchodu. Aktuální majitel bude nahrazen",
+          "changeMktOwnerWarn": "Chystáte se změnit majitele Marketplace. Aktuální majitel bude nahrazen",
           "accountsSettingsLabel": "účty",
           "accountsSettingsTitle": "účty",
           "accountsSettingsDescription": "Nastavení účtu"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Nemůžete přímo pozvat uživatele jako vlastníka. Propagujte existujícího administrátora"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/de.json b/imports/plugins/core/accounts/server/i18n/de.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Kontoeinstellungen"
         },
         "settings": {
+          "continue": "Fortsetzen",
+          "cancel": "Abbrechen",
+          "changeOwner": "Besitzer wechseln",
+          "changeShopOwnerWarn": "Sie sind dabei, den Ladenbesitzer zu wechseln. Der derzeitige Besitzer wird ersetzt",
+          "changeMktOwnerWarn": "Sie sind dabei, den Marktbesitzer zu wechseln. Der derzeitige Besitzer wird ersetzt",
           "accountsSettingsLabel": "Buchhaltung",
           "accountsSettingsTitle": "Buchhaltung",
           "accountsSettingsDescription": "Kontoeinstellungen"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Sie können einen Benutzer nicht direkt als Besitzer einladen. Fördern Sie einen vorhandenen Admin"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/el.json b/imports/plugins/core/accounts/server/i18n/el.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Ρυθμίσεις λογαριασμού"
         },
         "settings": {
+          "continue": "Συνεχίζω",
+          "cancel": "Ακύρωση",
+          "changeOwner": "Αλλαγή ιδιοκτήτη",
+          "changeShopOwnerWarn": "Πρόκειται να αλλάξετε τον ιδιοκτήτη του καταστήματος. Ο τρέχων κάτοχος θα αντικατασταθεί",
+          "changeMktOwnerWarn": "Πρόκειται να αλλάξετε τον κάτοχο του Marketplace. Ο τρέχων κάτοχος θα αντικατασταθεί",
           "accountsSettingsLabel": "λογαριασμοί",
           "accountsSettingsTitle": "λογαριασμοί",
           "accountsSettingsDescription": "Ρυθμίσεις λογαριασμού"
         },
         "groupsInvite": {
           "name": "Τζον Σμιθ",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Δεν μπορείτε να καλέσετε απευθείας έναν χρήστη ως κάτοχο. Προωθήστε έναν υπάρχοντα διαχειριστή"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/es.json b/imports/plugins/core/accounts/server/i18n/es.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Configuraciones De La Cuenta"
         },
         "settings": {
+          "continue": "Continuar",
+          "cancel": "Cancelar",
+          "changeOwner": "Cambio de propietario",
+          "changeShopOwnerWarn": "Estás a punto de cambiar el dueño de la tienda. El propietario actual será reemplazado",
+          "changeMktOwnerWarn": "Está a punto de cambiar el propietario de Marketplace. El propietario actual será reemplazado",
           "accountsSettingsLabel": "Cuentas",
           "accountsSettingsTitle": "Cuentas",
           "accountsSettingsDescription": "Configuraciones De La Cuenta"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "No puede invitar directamente a un usuario como propietario. Promover un administrador existente"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/fr.json b/imports/plugins/core/accounts/server/i18n/fr.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Paramètres de compte"
         },
         "settings": {
+          "continue": "Continuer",
+          "cancel": "Annuler",
+          "changeOwner": "Change Owner",
+          "changeShopOwnerWarn": "Vous allez changer le propriétaire de la boutique. Le propriétaire actuel sera remplacé",
+          "changeMktOwnerWarn": "Vous êtes sur le point de changer le propriétaire du marché. Le propriétaire actuel sera remplacé",
           "accountsSettingsLabel": "Comptes",
           "accountsSettingsTitle": "Comptes",
           "accountsSettingsDescription": "Paramètres de compte"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Vous ne pouvez pas inviter directement un utilisateur en tant que propriétaire. Promouvoir un administrateur existant"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/he.json b/imports/plugins/core/accounts/server/i18n/he.json
@@ -1,5 +1,13 @@
 [{
   "i18n": "he",
   "ns": "reaction-accounts",
-  "translation": { }
+  "translation": {
+    "reaction-accounts": {
+      "admin": {
+        "settings": {
+          "cancel": "בטל"
+        }
+      }
+    }
+  }
 }]
diff --git a/imports/plugins/core/accounts/server/i18n/hr.json b/imports/plugins/core/accounts/server/i18n/hr.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Postavke računa"
         },
         "settings": {
+          "continue": "Nastaviti",
+          "cancel": "Prekini",
+          "changeOwner": "Promijeni vlasnika",
+          "changeShopOwnerWarn": "Namjeravate promijeniti vlasnika trgovine. Sadašnji vlasnik bit će zamijenjen",
+          "changeMktOwnerWarn": "Namjeravate promijeniti vlasnika tržišta. Sadašnji vlasnik bit će zamijenjen",
           "accountsSettingsLabel": "Računi",
           "accountsSettingsTitle": "Računi",
           "accountsSettingsDescription": "Postavke računa"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Ne možete izravno pozvati korisnika kao vlasnika. Promicanje postojećeg administratora"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/hu.json b/imports/plugins/core/accounts/server/i18n/hu.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Fiók beállítások"
         },
         "settings": {
+          "continue": "folytatódik",
+          "cancel": "Mégse",
+          "changeOwner": "Tulajdonos megváltoztatása",
+          "changeShopOwnerWarn": "Ön módosítani kívánja a Shop tulajdonost. A jelenlegi tulajdonost kicserélik",
+          "changeMktOwnerWarn": "Ön megváltoztatja a Marketplace tulajdonosát. A jelenlegi tulajdonost kicserélik",
           "accountsSettingsLabel": "Fiókok",
           "accountsSettingsTitle": "Fiókok",
           "accountsSettingsDescription": "Fiók beállítások"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Nem közvetlenül hívhatja meg a felhasználót tulajdonosként. Támogat egy meglévő adminisztrátort"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/it.json b/imports/plugins/core/accounts/server/i18n/it.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Impostazioni dell 'account"
         },
         "settings": {
+          "continue": "Continuare",
+          "cancel": "Annulla",
+          "changeOwner": "Cambiare proprietario",
+          "changeShopOwnerWarn": "Stai per cambiare il proprietario del negozio. L'attuale proprietario verrà sostituito",
+          "changeMktOwnerWarn": "Stai per cambiare il proprietario del Marketplace. L'attuale proprietario verrà sostituito",
           "accountsSettingsLabel": "Conti",
           "accountsSettingsTitle": "Conti",
           "accountsSettingsDescription": "Impostazioni dell 'account"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Non puoi invitare direttamente un utente come proprietario. Promuovere un amministratore esistente"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/my.json b/imports/plugins/core/accounts/server/i18n/my.json
@@ -10,13 +10,19 @@
           "accountsDescription": "အကောင့်ဆက်တင်များ"
         },
         "settings": {
+          "continue": "ဆက်လက်",
+          "cancel": "ပယ်ဖျက်ပါ",
+          "changeOwner": "ပြောင်းလဲမှုကိုပိုင်ရှင်",
+          "changeShopOwnerWarn": "သင်ကဆိုင်ပိုင်ရှင်တစ်ဦးကိုပြောင်းလဲခန့်ရှိပါသည်။ လက်ရှိပိုင်ရှင်အစားထိုးသွားမည်",
+          "changeMktOwnerWarn": "သင်က Marketplace ပိုင်ရှင်ပြောင်းပေးဖို့အကြောင်းကိုဖြစ်ကြသည်။ လက်ရှိပိုင်ရှင်အစားထိုးသွားမည်",
           "accountsSettingsLabel": "ငွေစာရင်း",
           "accountsSettingsTitle": "ငွေစာရင်း",
           "accountsSettingsDescription": "အကောင့်ဆက်တင်များ"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "သငျသညျကိုတိုက်ရိုက်ပိုင်ရှင်အဖြစ်အသုံးပြုသူတစ်ဦးကိုဖိတ်ခေါ်လို့မရပါဘူး။ ရှိပြီးသား admin ရဲ့မြှင့်တင်ရန်"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/nb.json b/imports/plugins/core/accounts/server/i18n/nb.json
@@ -1,5 +1,13 @@
 [{
   "i18n": "nb",
   "ns": "reaction-accounts",
-  "translation": { }
+  "translation": {
+    "reaction-accounts": {
+      "admin": {
+        "settings": {
+          "cancel": "Avbryt"
+        }
+      }
+    }
+  }
 }]
diff --git a/imports/plugins/core/accounts/server/i18n/nl.json b/imports/plugins/core/accounts/server/i18n/nl.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Account instellingen"
         },
         "settings": {
+          "continue": "Voortzetten",
+          "cancel": "Annuleren",
+          "changeOwner": "Wijzig eigenaar",
+          "changeShopOwnerWarn": "U gaat op de hoogte van de Winkel eigenaar. De huidige eigenaar wordt vervangen",
+          "changeMktOwnerWarn": "Je staat op het punt om de Marketplace-eigenaar te veranderen. De huidige eigenaar wordt vervangen",
           "accountsSettingsLabel": "Rekeningen",
           "accountsSettingsTitle": "Rekeningen",
           "accountsSettingsDescription": "Account instellingen"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "U kunt geen gebruiker als eigenaar uitnodigen. Bevorder een bestaande admin"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/pl.json b/imports/plugins/core/accounts/server/i18n/pl.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Ustawienia konta"
         },
         "settings": {
+          "continue": "Kontynuować",
+          "cancel": "Anulować",
+          "changeOwner": "Zmień właściciela",
+          "changeShopOwnerWarn": "Zamierzasz zmienić właściciela sklepu. Aktualny właściciel zostanie zastąpiony",
+          "changeMktOwnerWarn": "Zamierzasz zmienić właściciela Marketplace. Aktualny właściciel zostanie zastąpiony",
           "accountsSettingsLabel": "Konta",
           "accountsSettingsTitle": "Konta",
           "accountsSettingsDescription": "Ustawienia konta"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Nie możesz bezpośrednio zaprosić użytkownika jako właściciela. Promuj istniejącego administratora"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/pt.json b/imports/plugins/core/accounts/server/i18n/pt.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Configurações da conta"
         },
         "settings": {
+          "continue": "Continuar",
+          "cancel": "Cancelar",
+          "changeOwner": "Alterar proprietário",
+          "changeShopOwnerWarn": "Você está prestes a mudar o proprietário da loja. O proprietário atual será substituído",
+          "changeMktOwnerWarn": "Você está prestes a mudar o proprietário do Marketplace. O proprietário atual será substituído",
           "accountsSettingsLabel": "Contas",
           "accountsSettingsTitle": "Contas",
           "accountsSettingsDescription": "Configurações da conta"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Você não pode convidar diretamente um usuário como proprietário. Promover um administrador existente"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/ro.json b/imports/plugins/core/accounts/server/i18n/ro.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Setările contului"
         },
         "settings": {
+          "continue": "Continua",
+          "cancel": "Anulează",
+          "changeOwner": "Schimbați proprietarul",
+          "changeShopOwnerWarn": "Sunteți pe punctul de a schimba proprietarul magazinului. Actualul proprietar va fi înlocuit",
+          "changeMktOwnerWarn": "Sunteți pe punctul de a schimba proprietarul Marketplace. Actualul proprietar va fi înlocuit",
           "accountsSettingsLabel": "Conturi",
           "accountsSettingsTitle": "Conturi",
           "accountsSettingsDescription": "Setările contului"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Nu puteți invita direct un utilizator ca proprietar. Promovați un administrator existent"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/ru.json b/imports/plugins/core/accounts/server/i18n/ru.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Настройки аккаунта"
         },
         "settings": {
+          "continue": "Продолжать",
+          "cancel": "Отмена",
+          "changeOwner": "Изменить владельца",
+          "changeShopOwnerWarn": "Вы собираетесь изменить владельца магазина. Текущий владелец будет заменен",
+          "changeMktOwnerWarn": "Вы собираетесь изменить владельца Marketplace. Текущий владелец будет заменен",
           "accountsSettingsLabel": "Счета",
           "accountsSettingsTitle": "Счета",
           "accountsSettingsDescription": "Настройки аккаунта"
         },
         "groupsInvite": {
           "name": "Джон Смит",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Вы не можете напрямую приглашать пользователя в качестве владельца. Продвигать существующего администратора"
         }
       }
     }

diff --git a/imports/plugins/core/accounts/server/i18n/sl.json b/imports/plugins/core/accounts/server/i18n/sl.json
@@ -10,13 +10,19 @@
           "accountsDescription": "Nastavitve računa"
         },
         "settings": {
+          "continue": "Naprej",
+          "cancel": "Prekliči",
+          "changeOwner": "Spremeni lastnika",
+          "changeShopOwnerWarn": "Pravkar boste spremenili lastnika trgovine. Trenutni lastnik bo zamenjal",
+          "changeMktOwnerWarn": "Spremenili boste lastnika trga. Trenutni lastnik bo zamenjal",
           "accountsSettingsLabel": "računi",
           "accountsSettingsTitle": "računi",
           "accountsSettingsDescription": "Nastavitve računa"
         },
         "groupsInvite": {
           "name": "John Smith",
-          "email": "[email protected]"
+          "email": "[email protected]",
+          "inviteOwnerError": "Ne morete neposredno povabiti uporabnika kot lastnika. Spodbujanje obstoječega skrbnika"
         }
       }
     }