diff options
| author | Hsuan Lee <hsuan@cobinhood.com> | 2018-12-10 18:57:44 +0800 |
|---|---|---|
| committer | Hsuan Lee <hsuan@cobinhood.com> | 2018-12-10 19:02:47 +0800 |
| commit | c0ede3738ebc693d035943ecd226f991eb9149c1 (patch) | |
| tree | b318f6afda470984c198cea0248bb354f14a1bd4 /app/_locales | |
| parent | 283c23101dd614d50f4ab9c866727d13b131a3dd (diff) | |
| download | dexon-wallet-c0ede3738ebc693d035943ecd226f991eb9149c1.tar.gz dexon-wallet-c0ede3738ebc693d035943ecd226f991eb9149c1.tar.zst dexon-wallet-c0ede3738ebc693d035943ecd226f991eb9149c1.zip | |
Fix rebase errors
Diffstat (limited to 'app/_locales')
| -rw-r--r-- | app/_locales/pl/messages.json | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index e13aa9c2..78b005a6 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -98,18 +98,6 @@ "clickCopy": { "message": "Kliknij żeby skopiować" }, -<<<<<<< HEAD - "clickToAdd": { - "message": "Przycisnij $1, aby dodać go do swojego konta" - }, - "close": { - "message": "Zamknij" - }, - "chromeRequiredForHardwareWallets": { - "message": "Żeby połączyć się z portfelem sprzętowym, należy uruchomić MetaMask z przeglądarką Google Chrome." - }, -======= ->>>>>>> Update translations "confirm": { "message": "Potwierdź" }, @@ -915,16 +903,8 @@ "warning": { "message": "Uwaga" }, -<<<<<<< HEAD - "welcomeBack": { - "message": "Witaj z powrotem!" - }, - "welcome": { - "message": "Witaj w MetaMask" -======= "welcomeBeta": { "message": "Witaj w MetaMask Beta" ->>>>>>> Update translations }, "whatsThis": { "message": "Co to jest?" |