Skip to content

Commit

Permalink
Merge branch 'dev' into feat/reactions
Browse files Browse the repository at this point in the history
  • Loading branch information
bludnic committed Sep 22, 2023
2 parents 9723a1c + 1a96aac commit 320bc63
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/components/LoginForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:label="$t('login.password_label')"
autocomplete="current-password"
class="text-center"
color="#BBDEFB"
color="white"
:type="showPassphrase ? 'text' : 'password'"
variant="underlined"
>
Expand Down
4 changes: 2 additions & 2 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"date_yesterday": "Yesterday",
"incorrect_address": "Incorrect ADM address",
"no_public_key": "This address is not active yet. Unable to start a chat",
"unable_to_retrieve_no_public_key": "`{ Unable to decrypt message: no partner's public key }`",
"unable_to_retrieve_no_public_key": "`Unable to decrypt message: no partner's public key`",
"me": "Me",
"message": "Type a message",
"message_mac_os": "Type a message. Cmd + Ctrl + Space for Emoji picker",
Expand Down Expand Up @@ -262,7 +262,7 @@
"REGISTERED": "Pending, waiting for confirmations",
"CONFIRMED": "Success",
"INVALID": "Inconsistent",
"UNKNOWN": "Unknown"
"UNKNOWN": "Unknown"
},
"statuses_add": {
"instant_send": "Confirmed as InstantSend (yet 0 network confirmations)",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"date_yesterday": "Вчера",
"incorrect_address": "Неправильный ADM-адрес",
"no_public_key": "Этот адрес еще не использовался. С ним нельзя начать чат",
"unable_to_retrieve_no_public_key": "`{ Не могу прочитать сообщение: нет публичного ключа собеседника }`",
"unable_to_retrieve_no_public_key": "`Не могу прочитать сообщение: нет публичного ключа собеседника`",
"me": "Я",
"message": "Введите сообщение",
"message_mac_os": "Введите сообщение. Cmd + Ctrl + Space для выбора смайлика",
Expand Down

0 comments on commit 320bc63

Please sign in to comment.