Skip to content

Commit bf6d897

Browse files
RealBonusRealBonus
committed
Merge branch 'release/1.4'
2 parents 0366be4 + 9453014 commit bf6d897

File tree

87 files changed

+1604
-409
lines changed

Some content is hidden

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

87 files changed

+1604
-409
lines changed

‎Adamant.xcodeproj/project.pbxproj

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
4411402421C8B290703B13EB /* Pods_Adamant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C107D5CB65B4D728B9D97C0F /* Pods_Adamant.framework */; };
11+
6406D74A21C7F06000196713 /* SearchResultsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6406D74821C7F06000196713 /* SearchResultsViewController.xib */; };
1112
6406D74D21CE3AC100196713 /* KeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6406D74C21CE3AC100196713 /* KeyboardManager.swift */; };
1213
6414C18E217DF43100373FA6 /* String+adamant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6414C18D217DF43100373FA6 /* String+adamant.swift */; };
1314
6416B19D21AD7B92006089AC /* LskWalletRoutes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6416B19C21AD7B92006089AC /* LskWalletRoutes.swift */; };
@@ -31,6 +32,7 @@
3132
6455E9F121075D3600B2E94C /* AddressBookService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6455E9F021075D3600B2E94C /* AddressBookService.swift */; };
3233
6455E9F321075D8000B2E94C /* AdamantAddressBookService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6455E9F221075D8000B2E94C /* AdamantAddressBookService.swift */; };
3334
6458548C211B3AB1004C5909 /* WelcomeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6458548A211B3AB1004C5909 /* WelcomeViewController.xib */; };
35+
645AE06621E67D3300AD3623 /* UITextField+adamant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645AE06521E67D3300AD3623 /* UITextField+adamant.swift */; };
3436
645E7B062111DF3A006CC9FD /* Crypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645E7B052111DF3A006CC9FD /* Crypto.swift */; };
3537
645FEB34213E72C100D6BA2D /* OnboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645FEB32213E72C100D6BA2D /* OnboardViewController.swift */; };
3638
645FEB35213E72C100D6BA2D /* OnboardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 645FEB33213E72C100D6BA2D /* OnboardViewController.xib */; };
@@ -39,6 +41,8 @@
3941
649D6BE821B95DB7009E727B /* LskWalletService+RichMessageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649D6BE721B95DB7009E727B /* LskWalletService+RichMessageProvider.swift */; };
4042
649D6BEA21B9627B009E727B /* LskWalletService+RichMessageProviderWithStatusCheck.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649D6BE921B9627B009E727B /* LskWalletService+RichMessageProviderWithStatusCheck.swift */; };
4143
649D6BEC21BD5A53009E727B /* UISuffixTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649D6BEB21BD5A53009E727B /* UISuffixTextField.swift */; };
44+
649D6BF021BFF481009E727B /* AdamantChatsProvider+search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649D6BEF21BFF481009E727B /* AdamantChatsProvider+search.swift */; };
45+
649D6BF221C27D5C009E727B /* SearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649D6BF121C27D5C009E727B /* SearchResultsViewController.swift */; };
4246
649E9A152111B3C200686B01 /* Mnemonic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649E9A142111B3C200686B01 /* Mnemonic.swift */; };
4347
64A223D620F760BB005157CB /* Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A223D520F760BB005157CB /* Localization.swift */; };
4448
64A223D820F7A08E005157CB /* LskApiService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A223D720F7A08E005157CB /* LskApiService.swift */; };
@@ -299,6 +303,7 @@
299303
/* End PBXContainerItemProxy section */
300304

301305
/* Begin PBXFileReference section */
306+
6406D74821C7F06000196713 /* SearchResultsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchResultsViewController.xib; sourceTree = "<group>"; };
302307
6406D74C21CE3AC100196713 /* KeyboardManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardManager.swift; sourceTree = "<group>"; };
303308
6414C18D217DF43100373FA6 /* String+adamant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+adamant.swift"; sourceTree = "<group>"; };
304309
6416B19C21AD7B92006089AC /* LskWalletRoutes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LskWalletRoutes.swift; sourceTree = "<group>"; };
@@ -322,6 +327,7 @@
322327
6455E9F021075D3600B2E94C /* AddressBookService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressBookService.swift; sourceTree = "<group>"; };
323328
6455E9F221075D8000B2E94C /* AdamantAddressBookService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantAddressBookService.swift; sourceTree = "<group>"; };
324329
6458548A211B3AB1004C5909 /* WelcomeViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WelcomeViewController.xib; sourceTree = "<group>"; };
330+
645AE06521E67D3300AD3623 /* UITextField+adamant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITextField+adamant.swift"; sourceTree = "<group>"; };
325331
645E7B052111DF3A006CC9FD /* Crypto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Crypto.swift; sourceTree = "<group>"; };
326332
645FEB32213E72C100D6BA2D /* OnboardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardViewController.swift; sourceTree = "<group>"; };
327333
645FEB33213E72C100D6BA2D /* OnboardViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OnboardViewController.xib; sourceTree = "<group>"; };
@@ -330,6 +336,8 @@
330336
649D6BE721B95DB7009E727B /* LskWalletService+RichMessageProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LskWalletService+RichMessageProvider.swift"; sourceTree = "<group>"; };
331337
649D6BE921B9627B009E727B /* LskWalletService+RichMessageProviderWithStatusCheck.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LskWalletService+RichMessageProviderWithStatusCheck.swift"; sourceTree = "<group>"; };
332338
649D6BEB21BD5A53009E727B /* UISuffixTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UISuffixTextField.swift; sourceTree = "<group>"; };
339+
649D6BEF21BFF481009E727B /* AdamantChatsProvider+search.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AdamantChatsProvider+search.swift"; sourceTree = "<group>"; };
340+
649D6BF121C27D5C009E727B /* SearchResultsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultsViewController.swift; sourceTree = "<group>"; };
333341
649E9A142111B3C200686B01 /* Mnemonic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mnemonic.swift; sourceTree = "<group>"; };
334342
64A223D520F760BB005157CB /* Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Localization.swift; sourceTree = "<group>"; };
335343
64A223D720F7A08E005157CB /* LskApiService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LskApiService.swift; sourceTree = "<group>"; };
@@ -798,6 +806,7 @@
798806
E927171D20C04613002BB9A6 /* UIColor+hex.swift */,
799807
E98FC34320F920BD00032D65 /* UIFont+adamant.swift */,
800808
E9D1BE19211DA25300E86B72 /* UIView+constraints.swift */,
809+
645AE06521E67D3300AD3623 /* UITextField+adamant.swift */,
801810
);
802811
path = Helpers;
803812
sourceTree = "<group>";
@@ -1013,6 +1022,8 @@
10131022
E95F85C6200A9B070070534A /* ChatTableViewCell.xib */,
10141023
E974D167215D033C003AD7E8 /* ChatCell.swift */,
10151024
E9240BF8215D813A00187B09 /* CustomCellDeleage.swift */,
1025+
649D6BF121C27D5C009E727B /* SearchResultsViewController.swift */,
1026+
6406D74821C7F06000196713 /* SearchResultsViewController.xib */,
10161027
);
10171028
path = Chats;
10181029
sourceTree = "<group>";
@@ -1090,6 +1101,7 @@
10901101
E93B0D752028B28E00126346 /* AdamantChatsProvider.swift */,
10911102
E9A174B62057F1B3003667CD /* AdamantChatsProvider+backgroundFetch.swift */,
10921103
E987024820C2B1F700E393F4 /* AdamantChatsProvider+fakeMessages.swift */,
1104+
649D6BEF21BFF481009E727B /* AdamantChatsProvider+search.swift */,
10931105
E9B3D3A8202082450019EB36 /* AdamantTransfersProvider.swift */,
10941106
E9A174B42057EDCE003667CD /* AdamantTransfersProvider+backgroundFetch.swift */,
10951107
E9722067201F42CC004F2AAD /* InMemoryCoreDataStack.swift */,
@@ -1324,6 +1336,7 @@
13241336
E9EC3416200524CA00C0E546 /* Exo+2_300_normal.ttf in Resources */,
13251337
E9EC341C200524CA00C0E546 /* Roboto_400_italic.ttf in Resources */,
13261338
E94E7B0C205D5E4A0042B639 /* TransactionsListViewControllerBase.xib in Resources */,
1339+
6406D74A21C7F06000196713 /* SearchResultsViewController.xib in Resources */,
13271340
E9EC3415200524CA00C0E546 /* Exo+2_100_normal.ttf in Resources */,
13281341
E9EC341A200524CA00C0E546 /* Exo+2_700_normal.ttf in Resources */,
13291342
E95CB456205D77B500A7218E /* Localizable.strings in Resources */,
@@ -1374,9 +1387,9 @@
13741387
"${BUILT_PRODUCTS_DIR}/Eureka/Eureka.framework",
13751388
"${BUILT_PRODUCTS_DIR}/FTIndicator/FTIndicator.framework",
13761389
"${BUILT_PRODUCTS_DIR}/FreakingSimpleRoundImageView/FreakingSimpleRoundImageView.framework",
1377-
"${BUILT_PRODUCTS_DIR}/Haring/Haring.framework",
13781390
"${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
13791391
"${BUILT_PRODUCTS_DIR}/Lisk/Lisk.framework",
1392+
"${BUILT_PRODUCTS_DIR}/MarkdownKit/MarkdownKit.framework",
13801393
"${BUILT_PRODUCTS_DIR}/MessageInputBar/MessageInputBar.framework",
13811394
"${BUILT_PRODUCTS_DIR}/MessageKit/MessageKit.framework",
13821395
"${BUILT_PRODUCTS_DIR}/MyLittlePinpad/MyLittlePinpad.framework",
@@ -1409,9 +1422,9 @@
14091422
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Eureka.framework",
14101423
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FTIndicator.framework",
14111424
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FreakingSimpleRoundImageView.framework",
1412-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Haring.framework",
14131425
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
14141426
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lisk.framework",
1427+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MarkdownKit.framework",
14151428
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MessageInputBar.framework",
14161429
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MessageKit.framework",
14171430
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MyLittlePinpad.framework",
@@ -1511,6 +1524,7 @@
15111524
E91947B020002393001362F8 /* AdamantApiService.swift in Sources */,
15121525
E921597B206503000000CA5C /* ButtonsStripeView.swift in Sources */,
15131526
E9A03FD820DC0ABA007653A1 /* AdamantNodesSource.swift in Sources */,
1527+
649D6BF221C27D5C009E727B /* SearchResultsViewController.swift in Sources */,
15141528
E9E7CD8D20026B6600DFC4DB /* DialogService.swift in Sources */,
15151529
E9E7CDB72003994E00DFC4DB /* AdamantUtilities.swift in Sources */,
15161530
E9147B6320505C7500145913 /* QRCodeReader+adamant.swift in Sources */,
@@ -1612,7 +1626,9 @@
16121626
E9150B802066861D0065A985 /* ChatViewController+MessageKit.swift in Sources */,
16131627
E90055F920ECD86800D0CB2D /* SecurityViewController+StayIn.swift in Sources */,
16141628
E90847322196FEA80095825D /* TransferTransaction+CoreDataClass.swift in Sources */,
1629+
645AE06621E67D3300AD3623 /* UITextField+adamant.swift in Sources */,
16151630
E90847392196FEF50095825D /* BaseTransaction+TransactionDetails.swift in Sources */,
1631+
649D6BF021BFF481009E727B /* AdamantChatsProvider+search.swift in Sources */,
16161632
E908473B219707200095825D /* AccountViewController+StayIn.swift in Sources */,
16171633
E9204B5220C9762400F3B9AB /* MessageStatus.swift in Sources */,
16181634
E993302421369B8A00CD5200 /* RichMessage.swift in Sources */,

‎Adamant/AppDelegate.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import Swinject
1111
import CryptoSwift
1212
import CoreData
1313

14-
1514
// MARK: - Constants
1615
extension String.adamantLocalized {
1716
struct tabItems {
@@ -113,12 +112,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
113112
notificationService = container.resolve(NotificationsService.self)
114113
dialogService = container.resolve(DialogService.self)
115114
addressBookService = container.resolve(AddressBookService.self)
116-
115+
117116
// MARK: 2. Init UI
118117
window = UIWindow(frame: UIScreen.main.bounds)
119118
window!.rootViewController = UITabBarController()
120-
window!.rootViewController?.view.backgroundColor = .white
121-
window!.tintColor = UIColor.adamant.primary
119+
window!.rootViewController!.view.backgroundColor = .white
120+
window!.tintColor = UIColor.adamant.primary
122121

123122
// MARK: 3. Prepare pages
124123
guard let router = container.resolve(Router.self) else {

‎Adamant/Assets/Assets.xcassets/Buttons/Arrow.imageset/Contents.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"info" : {
2020
"version" : 1,
2121
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
2225
}
2326
}

‎Adamant/Assets/Assets.xcassets/I.imageset/Contents.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "adm-logo.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎Adamant/Assets/Assets.xcassets/I.imageset/adm-logo.png

246 KB
Loading

‎Adamant/Assets/Assets.xcassets/Icons/error.imageset/Contents.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"info" : {
2020
"version" : 1,
2121
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
2225
}
2326
}

‎Adamant/Assets/Assets.xcassets/Row/row_themes.imageset/Contents.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "row_themes.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "row_themes@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "row_themes@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

‎Adamant/Assets/Assets.xcassets/Row/row_themes.imageset/row_themes.png

472 Bytes
Loading

‎Adamant/Assets/Assets.xcassets/Row/row_themes.imageset/row_themes@2x.png

1.04 KB
Loading

‎Adamant/Assets/Assets.xcassets/Row/row_themes.imageset/row_themes@3x.png

1.74 KB
Loading

‎Adamant/Assets/Assets.xcassets/TransactionStatus/status_warning.imageset/Contents.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "status_warning.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "status_warning@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "status_warning@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

‎Adamant/Assets/Assets.xcassets/TransactionStatus/status_warning.imageset/status_warning.png

612 Bytes
Loading

‎Adamant/Assets/Assets.xcassets/TransactionStatus/status_warning.imageset/status_warning@2x.png

1.16 KB
Loading

‎Adamant/Assets/Assets.xcassets/TransactionStatus/status_warning.imageset/status_warning@3x.png

1.82 KB
Loading

‎Adamant/Assets/Assets.xcassets/Transfers/transfer-in_bot.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
"author" : "xcode"
2222
},
2323
"properties" : {
24-
"template-rendering-intent" : "original"
24+
"template-rendering-intent" : "template"
2525
}
2626
}

‎Adamant/Assets/Assets.xcassets/Transfers/transfer-out_bot.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
"author" : "xcode"
2222
},
2323
"properties" : {
24-
"template-rendering-intent" : "original"
24+
"template-rendering-intent" : "template"
2525
}
2626
}

‎Adamant/Assets/Assets.xcassets/logo.imageset/Contents.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"info" : {
2020
"version" : 1,
2121
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
2225
}
2326
}

‎Adamant/Assets/l18n/de.lproj/Localizable.strings

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,15 @@
142142
/* Account tab: 'Get free tokens' button */
143143
"AccountTab.Row.FreeTokens" = "Kostenlose ADM Tokens";
144144

145+
/* Account tab: 'Theme' row */
146+
"AccountTab.Row.Theme" = "Design";
147+
148+
/* Account tab: 'Theme' row value 'Light' */
149+
"AccountTab.Row.Theme.Light" = "Light";
150+
151+
/* Account tab: 'Theme' row value 'Dark' */
152+
"AccountTab.Row.Theme.Dark" = "Dark";
153+
145154
/* Account tab: 'About' row */
146155
"AccountTab.Row.About" = "Über ADAMANT";
147156

@@ -193,6 +202,15 @@
193202
/* ChatList: outgoing message prefix */
194203
"ChatListPage.SentMessagePrefix" = "Sie: ";
195204

205+
/* ChatList: SearchBar placeholder text */
206+
"ChatListPage.SearchBar.Placeholder" = "Nach Kontakten oder Nachrichten suchen";
207+
208+
/* SearchPage: Contacts header */
209+
"SearchPage.Contacts" = "Kontakte";
210+
211+
/* SearchPage: Messages header */
212+
"SearchPage.Messages" = "Mitteilungen";
213+
196214
/* ChatList: First syncronization is in progress */
197215
"ChatListPage.SyncingChats" = "Chats werden synchronisiert…";
198216

@@ -244,6 +262,9 @@
244262
/* Chat: status message for pending chat transaction */
245263
"ChatScene.MessageStatus.Pending" = "Ausstehend";
246264

265+
/* Chat: status message for warning chat transaction */
266+
"ChatScene.MessageStatus.Warning" = "Warnung";
267+
247268
/* Chat: 'Sent funds' buble 'Tap for details' tip */
248269
"ChatScene.tapForDetails" = "Tippen Sie für Details";
249270

@@ -430,6 +451,9 @@
430451
/* New chat: Show QR for my address button */
431452
"NewChatScene.MyQr" = "Show my QR";
432453

454+
/* New Chat: 'What does it mean?', a help button for info about uninitialized accounts. */
455+
"NewChatScene.NotInitialized.HelpButton" = "Was bedeutet das?";
456+
433457
/* NodesList: Button label */
434458
"NodesList.NodesList" = "Node-Liste";
435459

@@ -754,16 +778,16 @@
754778
"WelcomeScene.Description.Slide1" = "Willkommen in ADAMANT, einem echten Messenger auf der <b>Blockchain</b>.";
755779

756780
/* Welcome: Slide 2 Description */
757-
"WelcomeScene.Description.Slide2" = "ADAMANT ist <b>Anonymität</b> und <b>Sicherheit</b> Ihrer Kommunikation sowie Versand von Kryptowährungen in Chats.<br/><br/><a href=\"https://medium.com/adamant-im/adamant-security-features-e7cc836ff52c\">Warum sind alle anderen Messenger nicht sicher?</a>";
781+
"WelcomeScene.Description.Slide2" = "Mit ADAMANT können Sie anonym und sicher Nachrichten sowie Kryptowährung im Chat versenden.<br/><br/><a href=\"https://medium.com/adamant-im/adamant-security-features-e7cc836ff52c\">Warum sind alle anderen Messenger nicht sicher?</a>";
758782

759783
/* Welcome: Slide 3 Description */
760-
"WelcomeScene.Description.Slide3" = "Die Infrastruktur von ADAMANT hat keinen Besitzer, sie ist <b>dezentralisiert</b>.<br/><br/>Für ihre Unterstützung alle Nachrichten im Messenger werden mit ADM-Tokens bezahlt. Neue Konten erhalten kostenlose Tokens als Geschenk";
784+
"WelcomeScene.Description.Slide3" = "Die Infrastruktur von ADAMANT hat keinen Besitzer, sie ist <b>dezentralisiert</b>.<br/><br/>Für ihre Unterstützung werden alle Nachrichten im Messenger werden mit ADM-Tokens bezahlt. Neue Konten erhalten kostenlose Tokens als Geschenk";
761785

762786
/* Welcome: Slide 4 Description */
763787
"WelcomeScene.Description.Slide4" = "Um eine Konversation zu starten, erstellen Sie einfach ein neues Konto mit einem Klick <b>(Sie müssen keine Daten eingeben)</b> und fügen Sie Ihren ersten Gesprächspartner hinzu.<br/><br/>Wenn Sie Ihre Anonymität schätzen, empfehlen wir Ihnen, ADAMANT-Adressen <b>persönlich</b> mitzuteilen.";
764788

765789
/* Welcome: Slide 5 Description */
766-
"WelcomeScene.Description.Slide5" = "Der Quellcode des Projekts ist <a href=\"https://github.com/Adamant-im/\">zu 100% offen</a>. Die App wird entwickelt und neue Funktionen werden ständig hinzugefügt.<br/><br/>Wenn Sie Entwickler sind, sind Sie bei uns herzlich willkommen.";
790+
"WelcomeScene.Description.Slide5" = "Der Quellcode des Projekts ist <a href=\"https://github.com/Adamant-im/\">zu 100% offen</a>. Die App wird fortlaufend entwickelt und neue Funktionen werden ständig hinzugefügt.<br/><br/>Wenn Sie Entwickler sind, sind Sie bei uns herzlich willkommen.";
767791

768792
/* WelcomeScene.Description.BeginButton */
769793
"WelcomeScene.Description.BeginButton" = "Sichere Kommunikation starten";

0 commit comments

Comments
 (0)