fix: conflicts

getAlby · May 24, 2024 · a08b509 · a08b509
1 parent 9f308a5
commit a08b509
Show file tree

Hide file tree

Showing 22 changed files with 2 additions and 34 deletions.
diff --git a/src/i18n/locales/cs/translation.json b/src/i18n/locales/cs/translation.json
@@ -283,7 +283,6 @@
           "your_ln_address": "Vaše Lightning adresa:",
           "scan_qr": "Importujte tuto peněženku do Zeus nebo BlueWallet naskenováním QR kódu."
         },
-        "title2": "Upravit účet",
         "name": {
           "title": "Jméno",
           "placeholder": "Jméno účtu"

diff --git a/src/i18n/locales/da/translation.json b/src/i18n/locales/da/translation.json
@@ -250,7 +250,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "Rediger konto",
         "name": {
           "title": "Navn",
           "placeholder": "Kontonavn"

diff --git a/src/i18n/locales/de/translation.json b/src/i18n/locales/de/translation.json
@@ -426,8 +426,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "Konto",
-        "title1": "Kontoeinstellung",
         "name": {
           "title": "Name anzeigen",
           "placeholder": "Konto Anzeigename"
@@ -1028,7 +1026,6 @@
       "options": {
         "account": {
           "go_to_web_wallet": "Verwalte dein Web-Konto",
-          "wallet_settings": "Wallet-Einstellungen",
           "add": "Verbinde deine Wallet"
         }
       },

diff --git a/src/i18n/locales/el/translation.json b/src/i18n/locales/el/translation.json
@@ -174,7 +174,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "Λογαριασμός",
         "mnemonic": {
           "backup": {
             "protocols": {
@@ -188,7 +187,6 @@
             "title": "Εισαγωγή του πρωτεύοντος κλειδιού σας"
           }
         },
-        "network": {},
         "nostr": {
           "settings": {
             "label": "Ρυθμίσεις Nostr",
@@ -219,7 +217,6 @@
           "your_ln_address": "Η Lightning διεύθυνση σας:",
           "screen_reader": "Εξαγωγή λεπτομερειών λογαριασμού"
         },
-        "remove": {},
         "actions": {
           "export": "Εξαγωγή"
         }

diff --git a/src/i18n/locales/es/translation.json b/src/i18n/locales/es/translation.json
@@ -295,7 +295,6 @@
           "title": "Nostr",
           "hint": "es un protocolo simple y abierto que tiene como objetivo crear redes sociales resistentes a la censura. Nostr trabaja con claves criptográficas. Para publicar algo, lo firma con su clave y lo envía a múltiples relevos. Puede usar Alby para administrar su clave Nostr. Muchas aplicaciones de Nostr le permitirán simplemente usar la clave de la extensión Alby."
         },
-        "title2": "Editar Cuenta",
         "name": {
           "title": "Nombre",
           "placeholder": "Nombre de la Cuenta"

diff --git a/src/i18n/locales/fa/translation.json b/src/i18n/locales/fa/translation.json
@@ -388,7 +388,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "حساب کاربری",
         "name": {
           "title": "نام نمایشی",
           "placeholder": "نام نمایشی حساب کاربری"
@@ -524,8 +523,7 @@
             "testnet": "شبکه آزمایشی"
           }
         },
-        "no_mnemonic_hint": "💡 شما هنوز یک کلید اصلی ندارید. <0>اینجا کلید کنید</0></div> تا کلید اصلی خود را بسازید و این تنظیمات را باز کنید.",
-        "title1": "تنظیمات کیف پول"
+        "no_mnemonic_hint": "💡 شما هنوز یک کلید اصلی ندارید. <0>اینجا کلید کنید</0></div> تا کلید اصلی خود را بسازید و این تنظیمات را باز کنید."
       },
       "title": "کیف پول ها",
       "actions": {
@@ -1202,7 +1200,6 @@
       "options": {
         "account": {
           "go_to_web_wallet": "حساب کاربری وب خود را مدیریت کنید",
-          "wallet_settings": "تنظیمات کیف پول",
           "add": "وصل کردن یک کیف پول"
         }
       },

diff --git a/src/i18n/locales/fr/translation.json b/src/i18n/locales/fr/translation.json
@@ -250,7 +250,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "Modifier le compte",
         "name": {
           "title": "Nom",
           "placeholder": "Nom du compte"

diff --git a/src/i18n/locales/hi/translation.json b/src/i18n/locales/hi/translation.json
@@ -664,8 +664,6 @@
           "remove_secretkey": "मास्टर की हटाएं",
           "export": "एक्सपोर्ट"
         },
-        "title1": "Account settings",
-        "title2": "खाता",
         "no_mnemonic_hint": "💡 आपके पास अभी तक मास्टर कुंजी नहीं है। अपनी मास्टर की बनाने और इन सेटिंग्स को अनलॉक करने के लिए <0>यहां क्लिक करें</0></div>।"
       },
       "title": "खाते"

diff --git a/src/i18n/locales/id/translation.json b/src/i18n/locales/id/translation.json
@@ -281,7 +281,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "Akun",
         "name": {
           "placeholder": "Tampilan nama akun",
           "title": "Tampilan Nama"

diff --git a/src/i18n/locales/it/translation.json b/src/i18n/locales/it/translation.json
@@ -263,7 +263,6 @@
           "scan_qr": "Importa questo wallet su Zeus o BlueWallet scansionando il QRCode.",
           "screen_reader": "Esporta i dettagli dell'account"
         },
-        "title2": "Modifica Account",
         "name": {
           "title": "Nome",
           "placeholder": "Nome Account"

diff --git a/src/i18n/locales/ja/translation.json b/src/i18n/locales/ja/translation.json
@@ -257,7 +257,6 @@
           "export_uri": "LNDHubの認証URl",
           "scan_qr": "QRCコードをスキャンして、このウォレットをZeusまたはBlueWalletにインポートする。"
         },
-        "title2": "アカウント",
         "name": {
           "title": "表示名",
           "placeholder": "アカウントの表示名"

diff --git a/src/i18n/locales/mr/translation.json b/src/i18n/locales/mr/translation.json
@@ -250,7 +250,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "खाते संपादित करा",
         "name": {
           "title": "नाव",
           "placeholder": "खात्याचे नाव"

diff --git a/src/i18n/locales/pl/translation.json b/src/i18n/locales/pl/translation.json
@@ -291,8 +291,6 @@
     },
     "accounts": {
       "account_view": {
-        "title1": "Ustawienia konta",
-        "title2": "Konto",
         "name": {
           "title": "Wyświetlana nazwa",
           "placeholder": "Nazwa wyświetlana konta"

diff --git a/src/i18n/locales/pt_BR/translation.json b/src/i18n/locales/pt_BR/translation.json
@@ -371,7 +371,6 @@
           "title": "Nome",
           "placeholder": "Nome da conta"
         },
-        "title2": "Conta",
         "mnemonic": {
           "saved": "Chave mestra criptografada e salva com sucesso.",
           "generate": {
@@ -437,8 +436,7 @@
             "regtest": "Regtest"
           }
         },
-        "no_mnemonic_hint": "💡 Você ainda não tem uma chave mestra. <0>Clique aqui</0></div> para gerar sua chave mestra e desbloquear essas configurações.",
-        "title1": "Configurações da carteira"
+        "no_mnemonic_hint": "💡 Você ainda não tem uma chave mestra. <0>Clique aqui</0></div> para gerar sua chave mestra e desbloquear essas configurações."
       },
       "actions": {
         "connect_a_wallet": "Conecte uma carteira"
@@ -1078,7 +1076,6 @@
       "options": {
         "account": {
           "go_to_web_wallet": "Acessar sua conta na web",
-          "wallet_settings": "Configurações da carteira",
           "add": "Conectar nova carteira"
         }
       },

diff --git a/src/i18n/locales/ro/translation.json b/src/i18n/locales/ro/translation.json
@@ -250,7 +250,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "Editeaza cont",
         "name": {
           "title": "Nume",
           "placeholder": "Nume cont"

diff --git a/src/i18n/locales/ru/translation.json b/src/i18n/locales/ru/translation.json
@@ -260,7 +260,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "",
         "name": {
           "title": "",
           "placeholder": ""

diff --git a/src/i18n/locales/sl/translation.json b/src/i18n/locales/sl/translation.json
@@ -303,7 +303,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "Račun",
         "export": {
           "screen_reader": "Izvozi podrobnosti računa",
           "your_ln_address": "Tvoj Lightning naslov:",

diff --git a/src/i18n/locales/sv/translation.json b/src/i18n/locales/sv/translation.json
@@ -299,7 +299,6 @@
           "error": "Det angivna kontonamnet matchade inte.",
           "confirm": "Ange namnet på kontot för att bekräfta raderingen av ditt konto.\n\n{{ name }}\n\n ⚠️ Alla associerade nycklar (Master Key, Nostr, etc) kommer att raderas om du fortsätter. Se till att du har säkerhetskopierat dem, det finns inget annat sätt att återställa dem."
         },
-        "title2": "Konto",
         "name": {
           "title": "Visnings Namn",
           "placeholder": "Konto visningsnamn"

diff --git a/src/i18n/locales/th/translation.json b/src/i18n/locales/th/translation.json
@@ -145,7 +145,6 @@
           "export": "ส่งออก",
           "remove_secretkey": "ลบ Master Key"
         },
-        "title2": "บัญชี",
         "name": {
           "title": "ชื่อที่ปรากฏ",
           "placeholder": "ชื่อที่ปรากฏบนบัญชี"

diff --git a/src/i18n/locales/uk/translation.json b/src/i18n/locales/uk/translation.json
@@ -250,7 +250,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "",
         "name": {
           "title": "",
           "placeholder": ""

diff --git a/src/i18n/locales/zh_Hans/translation.json b/src/i18n/locales/zh_Hans/translation.json
@@ -293,7 +293,6 @@
           "export": "导出",
           "remove_secretkey": "移除主密钥"
         },
-        "title2": "帐户",
         "name": {
           "title": "名称",
           "placeholder": "帐户名称"

diff --git a/src/i18n/locales/zh_Hant/translation.json b/src/i18n/locales/zh_Hant/translation.json
@@ -260,7 +260,6 @@
     },
     "accounts": {
       "account_view": {
-        "title2": "帳戶",
         "name": {
           "title": "名稱",
           "placeholder": "帳戶名稱"