Skip to content

Commit 72fea9e

Browse files
Merge pull request #14 from Beldex-Coin/dev
2 parents 4306efd + f78acdc commit 72fea9e

File tree

203 files changed

+11237
-2847
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+11237
-2847
lines changed

.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ node_modules
44
.eslintcache
55
stylesheets/*.css.map
66
/dist
7-
bin/*
87
.DS_Store
98
config/local.json
109
config/local-*.json
@@ -14,6 +13,10 @@ release/
1413
*.sublime*
1514
sql/
1615

16+
# bin dir
17+
bin/*
18+
!bin/.gitkeep
19+
1720
# generated files
1821
stylesheets/*.css
1922

@@ -26,8 +29,7 @@ test/ts/**/*.js
2629
ts/test/automation/**/*.js
2730
ts/test/automation/**/*.js.map
2831

29-
#wallet
30-
wallet
32+
3133
# Swapfiles
3234
**/*.swp
3335

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 81 deletions
This file was deleted.

_locales/ar/messages.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"typingAlt": "مؤثرات الكتابة لهذه المحادثة",
9191
"contactAvatarAlt": "صورة المتصل $name$",
9292
"downloadAttachment": "نَزِل المرفق",
93-
"replyToMessage": "Reply to Message",
93+
"replyToMessage": "Reply",
9494
"replyingToMessage": "الرد الى:",
9595
"originalMessageNotFound": "لم يتم العثور على الرسالة الأصلية",
9696
"originalMessageNotAvailable": "الرسالة الأصلية لم تعد متوفرة",
@@ -214,8 +214,8 @@
214214
"timerOption_1_day_abbreviated": "1يوم",
215215
"timerOption_1_week_abbreviated": "1أسبوع",
216216
"disappearingMessagesDisabled": "تم تعطيل الرسائل المختفية",
217-
"disabledDisappearingMessages": "$name$ disabled disappearing messages",
218-
"youDisabledDisappearingMessages": "You disabled disappearing messages",
217+
"disabledDisappearingMessages": "Disappearing messages have been disabled by $name$",
218+
"youDisabledDisappearingMessages": "Disappearing messages have been disabled by you",
219219
"timerSetTo": "تم تحديد المؤقت على $time$",
220220
"noteToSelf": "ملاحظة لنفسي",
221221
"hideMenuBarTitle": "إخفاء شريط القائمة",

_locales/bg/messages.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"reportIssue": "Сообщить о проблеме",
5050
"gotIt": "Понятно",
5151
"submit": "Отправить",
52-
"markAllAsRead": "Mark All as Read",
52+
"markAllAsRead": "Mark as read",
5353
"incomingError": "Ошибка при обработке входящего сообщения",
5454
"media": "Медиа",
5555
"mediaEmptyState": "Нет медиа-файлов",
@@ -111,7 +111,7 @@
111111
"error": "Ошибка",
112112
"delete": "Удалить",
113113
"messageDeletionForbidden": "You don’t have permission to delete others’ messages",
114-
"deleteJustForMe": "Delete just for me",
114+
"deleteJustForMe": "Delete message for me",
115115
"deleteForEveryone": "Delete for everyone",
116116
"deleteMessagesQuestion": "Delete those messages?",
117117
"deleteMessageQuestion": "Delete this message?",
@@ -128,7 +128,7 @@
128128
"resend": "Отправить ещё раз",
129129
"deleteConversationConfirmation": "Удалить этот разговор без возможности восстановления?",
130130
"clearAllData": "Очистить все данные",
131-
"deleteAccountWarning": "This will permanently delete your messages, and contacts.",
131+
"deleteAccountWarning": "This will permanently erase all your account data. Do you wish to clear data on this device or completely earse your account?",
132132
"deleteContactConfirmation": "Вы уверены, что хотите удалить этот разговор?",
133133
"quoteThumbnailAlt": "Миниатюра изображения из цитируемого сообщения",
134134
"imageAttachmentAlt": "Изображение, прикрепленное к сообщению",
@@ -148,7 +148,7 @@
148148
"savedTheFile": "Media saved by $name$",
149149
"linkPreviewsTitle": "Отправлять Предпросмотр Ссылки",
150150
"linkPreviewDescription": "Links are sent along with their previews.",
151-
"linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
151+
"linkPreviewsConfirmMessage": "Enabling link previews will minimize your metadata protection. Do you still want to proceed?.",
152152
"mediaPermissionsTitle": "Microphone",
153153
"mediaPermissionsDescription": "Enabling this option will allow access to your microphone.",
154154
"spellCheckTitle": "Проверка орфографии",
@@ -178,7 +178,7 @@
178178
"timestamp_m": "1 минута",
179179
"timestamp_h": "1 час",
180180
"timestampFormat_M": "D MMM",
181-
"messageBodyMissing": "Please enter a message body.",
181+
"messageBodyMissing": "Please enter a text or attach files to send.",
182182
"unblockToSend": "Разблокируйте этот контакт, чтобы отправить сообщение.",
183183
"unblockGroupToSend": "Чтобы послать сообщение, сначала разблокируйте эту группу",
184184
"youChangedTheTimer": "Вы установили таймер для исчезающих сообщений на $time$.",
@@ -200,7 +200,7 @@
200200
"changeNickname": "Change Nickname",
201201
"clearNickname": "Clear nickname",
202202
"nicknamePlaceholder": "New Nickname",
203-
"changeNicknameMessage": "Enter a nickname for this user",
203+
"changeNicknameMessage": "Set a nickname for $name$",
204204
"timerOption_0_seconds_abbreviated": "выключена",
205205
"timerOption_5_seconds_abbreviated": "",
206206
"timerOption_10_seconds_abbreviated": "10с",
@@ -240,7 +240,7 @@
240240
"titleIsNow": "Название группы поменялось на «$name$».",
241241
"joinedTheGroup": "$name$ присоединился к группе.",
242242
"multipleJoinedTheGroup": "$name$ присоединились к группе.",
243-
"kickedFromTheGroup": "$name$ was removed from the group.",
243+
"kickedFromTheGroup": "$name$ was removed.",
244244
"multipleKickedFromTheGroup": "$name$ were removed from the group.",
245245
"blockUser": "Заблокировать",
246246
"unblockUser": "Разблокировать",
@@ -277,10 +277,10 @@
277277
"changeAccountPasswordDescription": "Change your password",
278278
"removeAccountPasswordTitle": "Удалить Пароль",
279279
"removeAccountPasswordDescription": "Remove the password associated with your account",
280-
"enterPassword": "Please enter your password",
280+
"enterPassword": "Kindly enter your password ",
281281
"confirmPassword": "Confirm password",
282282
"pasteLongPasswordToastTitle": "The clipboard content exceeds the maximum password length of $max_pwd_len$ characters.",
283-
"showRecoveryPhrasePasswordRequest": "Please enter your password",
283+
"showRecoveryPhrasePasswordRequest": "Kindly enter your password ",
284284
"recoveryPhraseSavePromptMain": "Ваша секретная фраза является главным ключом к вашему BChat ID. Вы можете использовать ее для восстановления BChat ID, если потеряете доступ к своему устройству. Сохраните свою секретную фразу в безопасном месте, и никому её не передавайте.",
285285
"invalidSocialGroupUrl": "Invalid URL",
286286
"copiedToClipboard": "Скопировано в буфер обмена",
@@ -295,15 +295,15 @@
295295
"typeInOldPassword": "Please type in your old password",
296296
"invalidOldPassword": "Old password is invalid",
297297
"invalidPassword": "Invalid password",
298-
"noGivenPassword": "Please enter your password",
299-
"passwordsDoNotMatch": "Passwords do not match",
300-
"setPasswordInvalid": "Passwords do not match",
298+
"noGivenPassword": "Kindly enter your password ",
299+
"passwordsDoNotMatch": "Password mismatch. Kindly re-enter.",
300+
"setPasswordInvalid": "Password mismatch. Kindly re-enter.",
301301
"changePasswordInvalid": "The old password you entered is incorrect",
302302
"removePasswordInvalid": "Incorrect password",
303303
"setPasswordTitle": "Set Password",
304304
"changePasswordTitle": "Changed Password",
305305
"removePasswordTitle": "Removed Password",
306-
"setPasswordToastDescription": "Your password has been set. Please keep it safe.",
306+
"setPasswordToastDescription": "Password set successfully.",
307307
"changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
308308
"removePasswordToastDescription": "You have removed your password.",
309309
"publicChatExists": "You are already connected to this social group",
@@ -327,7 +327,7 @@
327327
"removeFromModerators": "Remove From Moderators",
328328
"add": "Add",
329329
"addingContacts": "Adding contacts to $name$",
330-
"noContactsToAdd": "No contacts to add",
330+
"noContactsToAdd": "You currently don't have any contacts.",
331331
"noMembersInThisGroup": "No other members in this group",
332332
"noModeratorsToRemove": "no moderators to remove",
333333
"onlyAdminCanRemoveMembers": "You are not the creator",
@@ -405,8 +405,8 @@
405405
"linkVisitWarningTitle": "Open this link in your browser?",
406406
"linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
407407
"open": "Open",
408-
"audioMessageAutoplayTitle": "Autoplay Audio Message",
409-
"audioMessageAutoplayDescription": "Audio messages are autoplayed",
408+
"audioMessageAutoplayTitle": "Autoplay Audio Message.",
409+
"audioMessageAutoplayDescription": "Audio messages will be autoplayed",
410410
"clickToTrustContact": "Click to download media",
411411
"trustThisContactDialogTitle": "Trust $name$?",
412412
"trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
@@ -446,7 +446,7 @@
446446
"decline": "Decline",
447447
"endCall": "End call",
448448
"cameraPermissionNeededTitle": "Voice/Video Call permissions required",
449-
"cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
449+
"cameraPermissionNeeded": "Allow 'Voice & Video Calls' under privacy settings to make a call.",
450450
"unableToCall": "Cancel your ongoing call first",
451451
"unableToCallTitle": "Cannot start new call",
452452
"callMissed": "Missed call from $name$",

_locales/ca/messages.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"error": "Error",
112112
"delete": "Suprimeix",
113113
"messageDeletionForbidden": "No teniu autorització per esborrar els missatges d'altres",
114-
"deleteJustForMe": "Delete just for me",
114+
"deleteJustForMe": "Delete message for me",
115115
"deleteForEveryone": "Delete for everyone",
116116
"deleteMessagesQuestion": "Delete those messages?",
117117
"deleteMessageQuestion": "Delete this message?",
@@ -128,7 +128,7 @@
128128
"resend": "Reenviar",
129129
"deleteConversationConfirmation": "Voleu suprimir aquesta conversa de forma permanent?",
130130
"clearAllData": "Esborrar totes les dades",
131-
"deleteAccountWarning": "This will permanently delete your messages, and contacts.",
131+
"deleteAccountWarning": "This will permanently erase all your account data. Do you wish to clear data on this device or completely earse your account?",
132132
"deleteContactConfirmation": "Estàs segur que vols esborrar aquesta conversa?",
133133
"quoteThumbnailAlt": "Miniatura d'una imatge d'un missatge citat",
134134
"imageAttachmentAlt": "Imatge adjunta al missatge",
@@ -148,7 +148,7 @@
148148
"savedTheFile": "Mèdia desada per $name$",
149149
"linkPreviewsTitle": "Envia previsualitzacions d'enllaços",
150150
"linkPreviewDescription": "Les previsualitzacions són compatibles amb la majoria d’Urls",
151-
"linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
151+
"linkPreviewsConfirmMessage": "Enabling link previews will minimize your metadata protection. Do you still want to proceed?.",
152152
"mediaPermissionsTitle": "Microphone",
153153
"mediaPermissionsDescription": "Enabling this option will allow access to your microphone.",
154154
"spellCheckTitle": "Revisar Ortografia",
@@ -404,8 +404,8 @@
404404
"linkVisitWarningTitle": "Open this link in your browser?",
405405
"linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
406406
"open": "Open",
407-
"audioMessageAutoplayTitle": "Autoplay Audio Message",
408-
"audioMessageAutoplayDescription": "Audio messages are autoplayed",
407+
"audioMessageAutoplayTitle": "Autoplay Audio Message.",
408+
"audioMessageAutoplayDescription": "Audio messages will be autoplayed",
409409
"clickToTrustContact": "Click to download media",
410410
"trustThisContactDialogTitle": "Trust $name$?",
411411
"trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
@@ -445,7 +445,7 @@
445445
"decline": "Decline",
446446
"endCall": "End call",
447447
"cameraPermissionNeededTitle": "Voice/Video Call permissions required",
448-
"cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
448+
"cameraPermissionNeeded": "Allow 'Voice & Video Calls' under privacy settings to make a call.",
449449
"unableToCall": "Cancel your ongoing call first",
450450
"unableToCallTitle": "Cannot start new call",
451451
"callMissed": "Missed call from $name$",

0 commit comments

Comments
 (0)