Skip to content

Commit

Permalink
Merge pull request #684 from TitanNano/import-export
Browse files Browse the repository at this point in the history
implementation for #190
  • Loading branch information
Adán Sánchez de Pedro Crespo committed Apr 19, 2015
2 parents 55f3b36 + c1b5ee7 commit d19a0b8
Show file tree
Hide file tree
Showing 9 changed files with 1,425 additions and 76 deletions.
28 changes: 27 additions & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,30 @@ <h1></h1>
</header>
<article id="main" class="active scroll"></article>
</section>
<section class="extended" id="backupPassword" data-transition="vertical">
<header data-title="Password" data-l10n-title="Password">
<nav class="on-left">
<button data-view-section="back" data-icon="remove" class="up"></button>
</nav>
</header>
<article class="scroll simple">
<p data-l10n-id="PasswordExplanationBackup"></p>
<input type="password" name="password" placeholder="enter your password" value="">
<div class="buttongroup">
<button id="selectPassword" data-l10n-id="SelectPassword">Select</button>
</div>
</article>
</section>
<section class="extended" id="pickBackup" data-transition="vertical">
<header data-title="Select Backup" data-l10n-title="SelectBackup">
<nav class="on-left">
<button class="up" data-view-section="back" data-icon="remove"></button>
</nav>
</header>
<article class="scroll">
<ul class="fileList"></ul>
</article>
</section>
<section id="otrMenu" data-transition="vertical">
<header data-title="OTR Settings" data-l10n-title="OTRMenu">
<nav class="on-left">
Expand Down Expand Up @@ -460,10 +484,12 @@ <h1></h1>
<script type="text/javascript;version=1.7" src="scripts/strophe/plugins/version.js"></script>
<script type="text/javascript;version=1.7" src="scripts/arlolra/dep/salsa20.js"></script>
<script type="text/javascript;version=1.7" src="scripts/arlolra/dep/bigint.js"></script>
<script type="text/javascript;version=1.7" src="scripts/arlolra/dep/crypto.js"></script>
<script type="text/javascript;version=1.7" src="scripts/arlolra/dep/eventemitter.js"></script>
<script type="text/javascript;version=1.7" src="scripts/arlolra/dsa-webworker.js"></script>
<script type="text/javascript;version=1.7" src="scripts/arlolra/otr.js"></script>
<script type="text/javascript;version=1.7" src="scripts/cryptoJS/aes.js"></script>
<script type="text/javascript;version=1.7" src="scripts/cryptoJS/evpkdf.js"></script>
<script type="text/javascript;version=1.7" src="scripts/cryptoJS/cipher-core.js"></script>
<script type="text/javascript;version=1.7" src="scripts/mozillahispano/coseme.js"></script>
<script type="text/javascript;version=1.7" src="scripts/loqui/store.js"></script>
<script type="text/javascript;version=1.7" src="scripts/loqui/app.js"></script>
Expand Down
21 changes: 20 additions & 1 deletion src/l10n/en.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# WELCOME SCREEN
# WELCOME SCREEN
WelcomeTo=Welcome to {{app}}!

# PROVIDERS
Expand Down Expand Up @@ -252,3 +252,22 @@ FreeSoftware=This program is free software, you may redistribute and/or modify i
consoleTitle=Console
consoleClear=Clear
Quit=Quit
# Import / Export
Backup=Backup
SelectBackup=Select Backup
ExportData=Exporting Data
EncryptingData=Encrypting Data
SavingBackup=Saving Backup
BackupStored=Backup sucessfuly stored on your SD card.
BackupFaild=Failed to save backup.
DecryptingData=Decrypting Data
DecryptionFailed=Decryption Failed
DecryptionFailedLong=Unable to decrypt your data. Please re enter your Password.
BackupRestoreLabel=Backup from
PasswordExplanationBackup=Please enter the password you want to encrypt your data with.
PasswordExplanationRestore=Please enter the password you used to encrypt the selcted backup with.
BackupApplyRequest=Are you sure that you want to apply this backup? All your current userdata will get removed and replaced.
RemovingCurrentData=Removing Current Data
ApplyingBackup=Applying Backup
SelectPassword=Use Password
35 changes: 35 additions & 0 deletions src/scripts/cryptoJS/aes.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d19a0b8

Please sign in to comment.