aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/raw-sl-rSI
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-02-05 00:22:26 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-02-05 00:22:26 +0100
commit6498c3443b9d9d80670c51386c43c28d782e5c9a (patch)
tree8b846f4ba6b85cda38f3615edac5f6383fdea3fe /OpenPGP-Keychain/src/main/res/raw-sl-rSI
parent1f1de0ce06dabf533840fd346f61854b8b0c8330 (diff)
downloadopen-keychain-6498c3443b9d9d80670c51386c43c28d782e5c9a.tar.gz
open-keychain-6498c3443b9d9d80670c51386c43c28d782e5c9a.tar.bz2
open-keychain-6498c3443b9d9d80670c51386c43c28d782e5c9a.zip
Update from transifex
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/raw-sl-rSI')
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html4
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html6
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html2
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html4
4 files changed, 11 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html
index 7db2f83de..773d11fa7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html
@@ -23,7 +23,9 @@
<h2>Libraries</h2>
<ul>
<li>
-<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
<li>
<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
<li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
index 32ad1a13d..28d025a9f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
@@ -3,10 +3,14 @@
<body>
<h2>2.3</h2>
<ul>
+<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
+<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
+<li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
+<li>querying key servers directly from the import screen</li>
+<li>fix layout and dialog style on Android 2.2-3.0</li>
<li>fix crash on keys with empty user ids</li>
<li>fix crash and empty lists when coming back from signing screen</li>
<li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
-<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
<li>fix upload of key from signing screen</li>
</ul>
<h2>2.2</h2>
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
index 2e7e637e5..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
@@ -3,7 +3,7 @@
<body>
<h2>How to receive keys</h2>
<ol>
-<li>Go to your partners 'Manage Public Keys' and long press on the key you want to share.</li>
+<li>Go to your partners contacts and open the contact you want to share.</li>
<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
<li>Tap the card and the content will then load on the your device.</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
index 453d435e3..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
@@ -3,8 +3,8 @@
<body>
<ol>
<li>Make sure that NFC is turned on in Settings &gt; More &gt; NFC and make sure that Android Beam is also on in the same section.</li>
-<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
-<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li>
+<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
<li>Tap the card and the content will then load on the other person’s device.</li>
</ol>
</body>