i18n: update source files
- Update tx config to include new string files
- Update two labels in xib file
Change-Id: I3871a14d4f15eb6bb41825b8e150faee64a47247
diff --git a/.tx/config b/.tx/config
index 481644d..384a33c 100644
--- a/.tx/config
+++ b/.tx/config
@@ -108,3 +108,45 @@
source_file = ui/Base.lproj/Conversation.strings
source_lang = en
type = STRINGS
+
+[ring.osxBackupAccountWindow]
+file_filter = ui/<lang>.lproj/BackupAccountWindow.strings
+source_file = ui/Base.lproj/BackupAccountWindow.strings
+source_lang = en
+type = STRINGS
+
+[ring.osxExportPasswordWindow]
+file_filter = ui/<lang>.lproj/ExportPasswordWindow.strings
+source_file = ui/Base.lproj/ExportPasswordWindow.strings
+source_lang = en
+type = STRINGS
+
+[ring.osxRingWizardNewAccount]
+file_filter = ui/<lang>.lproj/RingWizardNewAccount.strings
+source_file = ui/Base.lproj/RingWizardNewAccount.strings
+source_lang = en
+type = STRINGS
+
+[ring.osxRingWizardLinkAccount]
+file_filter = ui/<lang>.lproj/RingWizardLinkAccount.strings
+source_file = ui/Base.lproj/RingWizardLinkAccount.strings
+source_lang = en
+type = STRINGS
+
+[ring.osxRingWizardChoose]
+file_filter = ui/<lang>.lproj/RingWizardChoose.strings
+source_file = ui/Base.lproj/RingWizardChoose.strings
+source_lang = en
+type = STRINGS
+
+[ring.osxRegisterNameWindow]
+file_filter = ui/<lang>.lproj/RegisterNameWindow.strings
+source_file = ui/Base.lproj/RegisterNameWindow.strings
+source_lang = en
+type = STRINGS
+
+[ring.osxMigrateRingAccountsWindow]
+file_filter = ui/<lang>.lproj/MigrateRingAccountsWindow.strings
+source_file = ui/Base.lproj/MigrateRingAccountsWindow.strings
+source_lang = en
+type = STRINGS
diff --git a/ui/Base.lproj/AccGeneral.strings b/ui/Base.lproj/AccGeneral.strings
index 2c6ecb2..2da13bf 100644
--- a/ui/Base.lproj/AccGeneral.strings
+++ b/ui/Base.lproj/AccGeneral.strings
@@ -1,4 +1,7 @@
+/* Class = "NSButtonCell"; title = "RTP"; ObjectID = "0D8-im-2uM"; */
+"0D8-im-2uM.title" = "RTP";
+
/* Class = "NSButtonCell"; title = "Try Registration"; ObjectID = "21g-eQ-0Sc"; */
"21g-eQ-0Sc.title" = "Try Registration";
@@ -17,6 +20,9 @@
/* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "N5h-tI-ZLz"; */
"N5h-tI-ZLz.title" = "Upnp enabled";
+/* Class = "NSTextFieldCell"; title = "DTMF tone type"; ObjectID = "Rg8-qR-h1X"; */
+"Rg8-qR-h1X.title" = "DTMF tone type";
+
/* Class = "NSButtonCell"; title = "Show password"; ObjectID = "UXm-73-BNy"; */
"UXm-73-BNy.title" = "Show password";
@@ -26,6 +32,9 @@
/* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "YMy-QE-7A3"; */
"YMy-QE-7A3.title" = "Auto-answer calls";
+/* Class = "NSButtonCell"; title = "SIP"; ObjectID = "jch-Qt-hTO"; */
+"jch-Qt-hTO.title" = "SIP";
+
/* Class = "NSTextFieldCell"; title = "Parameters"; ObjectID = "mlN-YG-fLS"; */
"mlN-YG-fLS.title" = "Parameters";
diff --git a/ui/Base.lproj/AccRing.strings b/ui/Base.lproj/AccRing.strings
index 6bb91e5..c987de6 100644
--- a/ui/Base.lproj/AccRing.strings
+++ b/ui/Base.lproj/AccRing.strings
@@ -1,19 +1,19 @@
-/* Class = "NSTextFieldCell"; title = "This will be displayed to unknown peers"; ObjectID = "0Yt-xC-OWa"; */
-"0Yt-xC-OWa.title" = "This will be displayed to unknown peers";
-
/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "1Sx-Et-CDM"; */
"1Sx-Et-CDM.title" = "Account";
+/* Class = "NSTextFieldCell"; title = "RingID"; ObjectID = "8WI-fC-Due"; */
+"8WI-fC-Due.title" = "RingID";
+
/* Class = "NSTextFieldCell"; title = "Bootstrap server"; ObjectID = "B6b-iB-REZ"; */
"B6b-iB-REZ.title" = "Bootstrap server";
-/* Class = "NSTextFieldCell"; title = "TYPE"; ObjectID = "Bqr-Gq-OgA"; */
-"Bqr-Gq-OgA.title" = "TYPE";
-
/* Class = "NSTextFieldCell"; title = "Permissions"; ObjectID = "EDd-FX-wcz"; */
"EDd-FX-wcz.title" = "Permissions";
+/* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
+"G8M-go-xvD.title" = "Register name";
+
/* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
"HN3-i9-zmw.placeholderString" = "Name or nickname...";
@@ -26,15 +26,12 @@
/* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Wzq-V2-YLU"; */
"Wzq-V2-YLU.title" = "Alias";
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "bca-Wv-Xul"; */
-"bca-Wv-Xul.title" = "This is your RingID. Copy and share it with your friends!";
-
-/* Class = "NSTextFieldCell"; title = "Ring Identifier"; ObjectID = "dPO-b1-o58"; */
-"dPO-b1-o58.title" = "Ring Identifier";
-
/* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "ddk-1G-0jU"; */
"ddk-1G-0jU.title" = "Use custom user-agent";
+/* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
+"fSU-Pc-Y5a.title" = "Blockchain server";
+
/* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
"fX7-9W-XFl.title" = "Allow calls from peers in your contact list";
@@ -44,5 +41,5 @@
/* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "lHI-bz-ddQ"; */
"lHI-bz-ddQ.title" = "Upnp enabled";
-/* Class = "NSTextFieldCell"; title = "Type"; ObjectID = "ubB-AZ-nAm"; */
-"ubB-AZ-nAm.title" = "Type";
+/* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
+"sBB-y7-xhL.title" = "Registered Name";
diff --git a/ui/Base.lproj/Accounts.strings b/ui/Base.lproj/Accounts.strings
index 13226ba..80c929e 100644
--- a/ui/Base.lproj/Accounts.strings
+++ b/ui/Base.lproj/Accounts.strings
@@ -5,12 +5,6 @@
/* Class = "NSTextFieldCell"; placeholderString = "Type"; ObjectID = "KoR-IH-uuI"; */
"KoR-IH-uuI.placeholderString" = "Type";
-/* Class = "NSTextFieldCell"; title = "Create Account"; ObjectID = "OZ9-qH-dYW"; */
-"OZ9-qH-dYW.title" = "Create Account";
-
-/* Class = "NSButtonCell"; title = "Export"; ObjectID = "OeK-Sf-pdc"; */
-"OeK-Sf-pdc.title" = "Export";
-
/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "RT7-u6-bhe"; */
"RT7-u6-bhe.label" = "Advanced";
@@ -20,6 +14,9 @@
/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "ZDh-Jh-hfW"; */
"ZDh-Jh-hfW.placeholderString" = "Name";
+/* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
+"cT1-A5-rbj.label" = "Devices";
+
/* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
"eEz-Lm-SOj.placeholderString" = "Status";
@@ -28,6 +25,3 @@
/* Class = "NSTabViewItem"; label = "General"; ObjectID = "tPR-Ac-N5Y"; */
"tPR-Ac-N5Y.label" = "General";
-
-/* Class = "NSButtonCell"; title = "Import"; ObjectID = "zov-Bb-Fgp"; */
-"zov-Bb-Fgp.title" = "Import";
diff --git a/ui/Base.lproj/Conversation.strings b/ui/Base.lproj/Conversation.strings
index d8d262a..18f0e7d 100644
--- a/ui/Base.lproj/Conversation.strings
+++ b/ui/Base.lproj/Conversation.strings
@@ -8,13 +8,13 @@
/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
"Ilz-7v-2fr.placeholderString" = "Send a message";
-/* Class = "BindingConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Send a message";
-/* Class = "BindingConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Send a message";
-/* Class = "BindingConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Send a message";
/* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
diff --git a/ui/Base.lproj/CurrentCall.strings b/ui/Base.lproj/CurrentCall.strings
index 072a997..45d58f1 100644
--- a/ui/Base.lproj/CurrentCall.strings
+++ b/ui/Base.lproj/CurrentCall.strings
@@ -17,6 +17,9 @@
/* Class = "NSTextFieldCell"; placeholderString = "Incoming Display Name"; ObjectID = "EA3-Q5-Dyj"; */
"EA3-Q5-Dyj.placeholderString" = "Incoming Display Name";
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "G0w-c3-9pJ"; */
+"G0w-c3-9pJ.ibShadowedToolTip" = "Record";
+
/* Class = "NSButtonCell"; title = "Answer"; ObjectID = "KPG-pB-gPm"; */
"KPG-pB-gPm.title" = "Answer";
@@ -29,6 +32,9 @@
/* Class = "NSTextFieldCell"; title = "Cancel"; ObjectID = "TlL-HO-5Ey"; */
"TlL-HO-5Ey.title" = "Cancel";
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "VVL-A4-r7n"; */
+"VVL-A4-r7n.ibShadowedToolTip" = "Record";
+
/* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
"X0W-vv-xua.title" = "wants to talk to you!";
diff --git a/ui/Base.lproj/GeneralPrefs.strings b/ui/Base.lproj/GeneralPrefs.strings
index f05974f..134d36a 100644
--- a/ui/Base.lproj/GeneralPrefs.strings
+++ b/ui/Base.lproj/GeneralPrefs.strings
@@ -8,24 +8,27 @@
/* Class = "NSMenuItem"; title = "Weekly"; ObjectID = "AId-am-73Q"; */
"AId-am-73Q.title" = "Weekly";
-/* Class = "NSTextFieldCell"; title = "History"; ObjectID = "DSD-yl-noX"; */
-"DSD-yl-noX.title" = "History";
-
/* Class = "NSTextFieldCell"; title = "30"; ObjectID = "JvS-c4-OeT"; */
"JvS-c4-OeT.title" = "30";
+/* Class = "NSTextField"; ibShadowedToolTip = "Profile"; ObjectID = "MV1-AC-qE7"; */
+"MV1-AC-qE7.ibShadowedToolTip" = "Profile";
+
/* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
"O2C-xR-mHF.title" = "Launch on Startup";
/* Class = "NSTextFieldCell"; title = "(Applied on application restart)"; ObjectID = "OTl-vx-S43"; */
"OTl-vx-S43.title" = "(Applied on application restart)";
-/* Class = "NSTextFieldCell"; title = "Interruptions"; ObjectID = "Rzy-Gh-3wQ"; */
-"Rzy-Gh-3wQ.title" = "Interruptions";
+/* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
+"Rzy-Gh-3wQ.title" = "Behaviours";
/* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
"T3a-yx-ZaW.title" = "Automatically check for updates";
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "Thg-oC-5Qw"; */
+"Thg-oC-5Qw.title" = "Profile";
+
/* Class = "NSMenuItem"; title = "Daily"; ObjectID = "cB6-4m-9MU"; */
"cB6-4m-9MU.title" = "Daily";
@@ -41,14 +44,11 @@
/* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
"r4u-t3-gBc.title" = "Update";
-/* Class = "NSTextFieldCell"; title = "Window behaviour"; ObjectID = "sog-Ok-Y0N"; */
-"sog-Ok-Y0N.title" = "Window behaviour";
-
-/* Class = "NSButtonCell"; title = "Enable Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Notifications";
+/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
+"uCL-ye-tsv.title" = "Enable Desktop Notifications";
/* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
"uYI-hA-JHk.title" = "Bring Ring to foreground on incoming calls";
-/* Class = "NSTextFieldCell"; title = "Desktop Notifications"; ObjectID = "xlz-zw-IJI"; */
-"xlz-zw-IJI.title" = "Desktop Notifications";
+/* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
+"vbU-2S-O58.title" = "This is shared with your contacts ";
diff --git a/ui/Base.lproj/Localizable.strings b/ui/Base.lproj/Localizable.strings
index 9e143f2..cbc1f73 100644
--- a/ui/Base.lproj/Localizable.strings
+++ b/ui/Base.lproj/Localizable.strings
@@ -1,18 +1,21 @@
+"A network error occured during the export" = "A network error occured during the export";
+
+/* Contextual menu action */
"Add to contacts" = "Add to contacts";
+/* Text shown to the user */
+"Alias : " = "Alias : ";
+
/* Error shown to the user */
"An error occured during the export" = "An error occured during the export";
-/* Error shown to the user */
-"An error occured during the import" = "An error occured during the import";
+/* Contextual menu entry */
+"Backup account" = "Backup account";
/* Contextual menu action */
"Call number" = "Call number";
-/* Open panel prompt for 'Choose a file' */
-"Choose" = "Choose";
-
/* Open panel title */
"Choose a CA list" = "Choose a CA list";
@@ -34,24 +37,57 @@
/* Contextual menu entry */
"Choose file" = "Choose file";
-/* Continue button */
-"Continue" = "Continue";
-
/* No comment provided by engineer. */
"Copy" = "Copy";
/* Contextual menu action */
+"Copy name" = "Copy name";
+
+/* Contextual menu action */
"Copy number" = "Copy number";
+/* Contextual menu entry */
+"Create RING Account" = "Create RING Account";
+
+/* Contextual menu entry */
+"Create SIP Account" = "Create SIP Account";
+
+/* Alert dialog title */
+"Entered name not found" = "Entered name not found";
+
+/* Error message shown to user when it is impossible to migrate account */
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+
+/* Text shown to user when an error occur at registration */
+"Failed to perform lookup" = "Failed to perform lookup";
+
+/* Text shown to the user */
+"ID : " = "ID : ";
+
/* Incoming call from {Name} */
"Incoming call from %@" = "Incoming call from %@";
-/* Indication for user */
-"Just a moment..." = "Just a moment...";
+/* Alert dialo message */
+"Make sure you have at least one valid account" = "Make sure you have at least one valid account";
/* Message from {Name} */
"Message from %@" = "Message from %@";
+/* User label */
+"New SIP account" = "New SIP account";
+
+/* Alert dialog title */
+"No valid account available" = "No valid account available";
+
+/* Text show to the user when password didn't match */
+"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+
+/* Indication for user */
+"Password is too short" = "Password is too short";
+
+/* Indication for user */
+"Passwords don't match" = "Passwords don't match";
+
/* Button label */
"Pause" = "Pause";
@@ -67,8 +103,11 @@
/* Show advice to user */
"Reopen account to see your hash" = "Reopen account to see your hash";
-/* Display message to user */
-"Ring is already ready to work" = "Ring is already ready to work";
+/* Contextual menu entry */
+"Restore account" = "Restore account";
+
+/* Button title */
+"Revise Input" = "Revise Input";
/* No comment provided by engineer. */
"Share" = "Share";
@@ -76,6 +115,33 @@
/* No comment provided by engineer. */
"Text Actions" = "Text Actions";
+/* Text shown to user when his username is available to be registered */
+"The entered username is available" = "The entered username is available";
+
+/* Text shown to user when his username is invalid to be registered */
+"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+
+/* Text shown to user when his username is already registered */
+"The entered username is not available" = "The entered username is not available";
+
+/* Text shown to the user */
+"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+
+/* Error shown to the user */
+"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+
+/* Alert dialog title */
+"The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
+
+/* Title shown to user to concat with Pin */
+"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+
+/* Text shown to the user */
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+
/* Name used when user leave field empty */
"Unknown" = "Unknown";
+/* Error shown to user */
+"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+
diff --git a/ui/Base.lproj/MainMenu.strings b/ui/Base.lproj/MainMenu.strings
index dd14573..632731d 100644
--- a/ui/Base.lproj/MainMenu.strings
+++ b/ui/Base.lproj/MainMenu.strings
@@ -194,9 +194,6 @@
/* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
"534.title" = "Find and Replace…";
-/* Class = "NSMenuItem"; title = "Setup Ring"; ObjectID = "589"; */
-"589.title" = "Setup Ring";
-
/* Class = "NSMenuItem"; title = "Check for Update..."; ObjectID = "593"; */
"593.title" = "Check for Update...";
diff --git a/ui/Base.lproj/MigrateRingAccountsWindow.strings b/ui/Base.lproj/MigrateRingAccountsWindow.strings
index ca1377b..fceda8a 100644
--- a/ui/Base.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/Base.lproj/MigrateRingAccountsWindow.strings
@@ -5,8 +5,8 @@
/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
"859-10-HEb.placeholderString" = "RingID";
-/* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+/* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
/* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
"8K3-9Z-MKH.title" = "Account migration error";
diff --git a/ui/Base.lproj/RegisterNameWindow.strings b/ui/Base.lproj/RegisterNameWindow.strings
new file mode 100644
index 0000000..0b4aa52
--- /dev/null
+++ b/ui/Base.lproj/RegisterNameWindow.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+
+/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
+"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
+"Aeh-tK-RjX.title" = "An error occured during your username registration";
+
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Enter your Ring account password";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
+"JWw-7m-ywL.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "Just a moment...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Username...";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
+"cbA-c2-LlV.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
+"eoS-s7-b3w.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "fOn-FV-2x8"; */
+"fOn-FV-2x8.title" = "Ok";
+
+/* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
+"lT3-Bh-MnL.title" = "Register";
+
+/* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
+"tje-EZ-ZPI.title" = "Register username on the blockchain";
diff --git a/ui/Base.lproj/RingWindow.strings b/ui/Base.lproj/RingWindow.strings
index b6a9a7e..c50f874 100644
--- a/ui/Base.lproj/RingWindow.strings
+++ b/ui/Base.lproj/RingWindow.strings
@@ -20,8 +20,8 @@
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
"GAa-pQ-t4g.title" = "Text Cell";
-/* Class = "NSBox"; title = "Box"; ObjectID = "Pav-Bw-GgK"; */
-"Pav-Bw-GgK.title" = "Box";
+/* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
+"Pav-Bw-GgK.title" = "Title";
/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
"Q1F-xo-N3e.placeholderString" = "Display Role";
diff --git a/ui/Base.lproj/RingWizardChoose.strings b/ui/Base.lproj/RingWizardChoose.strings
index a777133..c3b4c3d 100644
--- a/ui/Base.lproj/RingWizardChoose.strings
+++ b/ui/Base.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
/* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
"Z9K-mD-ucr.title" = "Link this device to an account";
-/* Class = "NSButtonCell"; title = "New Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "New Ring account";
+/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Ring account";
diff --git a/ui/Base.lproj/RingWizardChoose.xib b/ui/Base.lproj/RingWizardChoose.xib
index 160a271..116c83c 100644
--- a/ui/Base.lproj/RingWizardChoose.xib
+++ b/ui/Base.lproj/RingWizardChoose.xib
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2553a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="RingWizardChooseVC">
@@ -16,16 +16,6 @@
<rect key="frame" x="0.0" y="0.0" width="525" height="138"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pcF-lX-ex4">
- <rect key="frame" x="160" y="96" width="205" height="29"/>
- <buttonCell key="cell" type="bevel" title="New Ring account" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="k1T-a7-yZD">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="createRingAccount:" target="-2" id="Mij-SG-JWQ"/>
- </connections>
- </button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="UXp-us-Mbl">
<rect key="frame" x="435" y="17" width="72" height="29"/>
<constraints>
@@ -44,8 +34,18 @@
</binding>
</connections>
</button>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pcF-lX-ex4">
+ <rect key="frame" x="160" y="81" width="205" height="29"/>
+ <buttonCell key="cell" type="bevel" title="Create a Ring account" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="k1T-a7-yZD">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="createRingAccount:" target="-2" id="Mij-SG-JWQ"/>
+ </connections>
+ </button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cpk-ql-oGP">
- <rect key="frame" x="160" y="64" width="205" height="29"/>
+ <rect key="frame" x="160" y="49" width="205" height="29"/>
<buttonCell key="cell" type="bevel" title="Link this device to an account" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Z9K-mD-ucr">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -63,7 +63,7 @@
<constraint firstAttribute="trailing" secondItem="UXp-us-Mbl" secondAttribute="trailing" constant="20" id="aKC-JI-SVx"/>
<constraint firstItem="pcF-lX-ex4" firstAttribute="centerX" secondItem="uHQ-s7-X3y" secondAttribute="centerX" id="iq8-Px-R61"/>
<constraint firstItem="pcF-lX-ex4" firstAttribute="leading" secondItem="cpk-ql-oGP" secondAttribute="leading" id="n6m-l1-sty"/>
- <constraint firstItem="pcF-lX-ex4" firstAttribute="top" secondItem="uHQ-s7-X3y" secondAttribute="top" constant="15" id="v64-PJ-sTS"/>
+ <constraint firstItem="pcF-lX-ex4" firstAttribute="top" secondItem="uHQ-s7-X3y" secondAttribute="top" constant="30" id="v64-PJ-sTS"/>
</constraints>
<point key="canvasLocation" x="-14.5" y="49"/>
</view>
diff --git a/ui/Base.lproj/RingWizardNewAccount.strings b/ui/Base.lproj/RingWizardNewAccount.strings
index 7d9d87f..68d7938 100644
--- a/ui/Base.lproj/RingWizardNewAccount.strings
+++ b/ui/Base.lproj/RingWizardNewAccount.strings
@@ -5,8 +5,8 @@
/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
"1TO-Ov-S8j.placeholderString" = "Mandatory*";
-/* Class = "NSButtonCell"; title = "Register a username on the blockchain"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register a username on the blockchain";
+/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register name publicly (experimental)";
/* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
"B6x-jj-48R.title" = "Choose your password";
diff --git a/ui/Base.lproj/RingWizardNewAccount.xib b/ui/Base.lproj/RingWizardNewAccount.xib
index eaba1b7..2b49928 100644
--- a/ui/Base.lproj/RingWizardNewAccount.xib
+++ b/ui/Base.lproj/RingWizardNewAccount.xib
@@ -229,8 +229,8 @@
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="b0r-ri-6ZA">
- <rect key="frame" x="72" y="215" width="257" height="18"/>
- <buttonCell key="cell" type="check" title="Register a username on the blockchain" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="AG5-GR-bii">
+ <rect key="frame" x="75" y="215" width="251" height="18"/>
+ <buttonCell key="cell" type="check" title="Register name publicly (experimental)" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="AG5-GR-bii">
<behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
@@ -241,7 +241,7 @@
</connections>
</button>
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WGe-uI-HhQ">
- <rect key="frame" x="337" y="210" width="25" height="25"/>
+ <rect key="frame" x="334" y="210" width="25" height="25"/>
<buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="joF-an-KU7">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>