git ssb - fixing conflicts · mixmix/ticktack@aed5ebed

changed

translations/en.jsView
		@@ -221,8 +221,41 @@
221	221	title: 'Import Identity'
222	222	}
223	223	}
224	224	},
	225	+ backup: {
	226	+ sectionName: 'Backup',
	227	+ ftu: {
	228	+ importAction: 'Import identity',
	229	+ createAction: 'Create new identity',
	230	+ busyMessage: 'Processing...',
	231	+ welcomeHeader: 'Welcome to Ticktack',
	232	+ welcomeMessage: 'Do you want to create a new identity or import one?'
	233	+ },
	234	+ export: {
	235	+ header: 'Export identity',
	236	+ message: [
	237	+ 'Please backup your private key file very carefully.',
	238	+ 'If your private key is hacked, all your private messages will be retrieved by third party, and your identity will be faked on the network'
	239	+ ],
	240	+ passwordPlaceholder: 'Please enter password to protect export file',
	241	+ cancelAction: 'Cancel',
	242	+ exportAction: 'Export Identity',
	243	+ dialog: {
	244	+ label: 'Export Identity',
	245	+ title: 'Export Identity'
	246	+ }
	247	+ },
	248	+ import: {
	249	+ header: 'Import identity',
	250	+ importAction: 'Import Identity',
	251	+ synchronizeMessage: 'Synchronizing feed: ',
	252	+ dialog: {
	253	+ label: 'Import Identity',
	254	+ title: 'Import Identity'
	255	+ }
	256	+ }
	257	+ },
225	258	languages: {
226	259	en: 'English',
227	260	zh: '中文'
228	261	}

mixmix / ticktack