From c6dc64742a4b28b1583ab03dff60b539172f9d90 Mon Sep 17 00:00:00 2001
From: Dominik <dominik@dominikschuermann.de>
Date: Mon, 12 Mar 2012 00:12:19 +0100
Subject: further ui developments

---
 org_apg/res/values/arrays.xml  | 173 +----------------------------------------
 org_apg/res/values/strings.xml |  12 +--
 2 files changed, 9 insertions(+), 176 deletions(-)

(limited to 'org_apg/res/values')

diff --git a/org_apg/res/values/arrays.xml b/org_apg/res/values/arrays.xml
index 25a4e66df..05320c609 100644
--- a/org_apg/res/values/arrays.xml
+++ b/org_apg/res/values/arrays.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -29,7 +30,6 @@
         <item>@string/choice_4hours</item>
         <item>@string/choice_8hours</item>
     </string-array>
-
     <string-array name="pass_phrase_cache_ttl_values">
         <item>15</item>
         <item>60</item>
@@ -44,171 +44,4 @@
         <item>28800</item>
     </string-array>
 
-    <string-array name="language_entries">
-        <item>@string/choice_language_system</item>
-        <item>Afrikaans</item>
-        <item>Bahasa indonesia</item>
-        <item>Bahasa melayu</item>
-        <item>Bamanankan</item>
-        <item>Català</item>
-        <item>Cymraeg</item>
-        <item>Dansk</item>
-        <item>Deutsch</item>
-        <item>Dholuo</item>
-        <item>Eesti</item>
-        <item>English</item>
-        <item>Español</item>
-        <item>Fulfulde, Pulaar, Pular</item>
-        <item>Gaeilge</item>
-        <item>Galego</item>
-        <item>Hausa</item>
-        <item>Hrvatski</item>
-        <item>Kinyarwanda</item>
-        <item>Kirundi</item>
-        <item>Kiswahili</item>
-        <item>Latviešu</item>
-        <item>Lietuviškai</item>
-        <item>Magyar</item>
-        <item>Malti</item>
-        <item>Nederlands</item>
-        <item>Norsk bokmål</item>
-        <item>Pyccĸий</item>
-        <item>Română</item>
-        <item>Slovenčina</item>
-        <item>Slovenščina</item>
-        <item>Somali</item>
-        <item>Српски</item>
-        <item>Tiếng Việt</item>
-        <item>Tϋrkçe</item>
-        <item>Wolof</item>
-        <item>Yorùbá</item>
-        <item>Azərbaycan</item>
-        <item>Euskera</item>
-        <item>Français</item>
-        <item>isiXhosa</item>
-        <item>isiZulu</item>
-        <item>Italiano</item>
-        <item>O\'zbek</item>
-        <item>Polski</item>
-        <item>Português</item>
-        <item>Shqip</item>
-        <item>Suomi</item>
-        <item>Svenska</item>
-        <item>Íslenska</item>
-        <item>Čeština</item>
-        <item>Ɛʋɛ</item>
-        <item>Ελληνικά</item>
-        <item>Беларуская</item>
-        <item>Български</item>
-        <item>Кыргыз</item>
-        <item>Македонски</item>
-        <item>Українська</item>
-        <item>аҧсуа бызшәа</item>
-        <item>Қазақ</item>
-        <item>Հայերեն</item>
-        <item>עברית</item>
-        <item>اردو</item>
-        <item>العربية</item>
-        <item>فارسی</item>
-        <item>پښتو</item>
-        <item>हिंदी</item>
-        <item>తెలుగు</item>
-        <item>ಕನ್ನಡ</item>
-        <item>ภาษาไทย</item>
-        <item>አማርኛ</item>
-        <item>中文</item>
-        <item>日本語</item>
-        <item>한국어</item>
-    </string-array>
-
-    <string-array name="language_values">
-        <item></item>
-        <item>af</item>
-        <item>id</item>
-        <item>ms</item>
-        <item>bm</item>
-        <item>ca</item>
-        <item>cy</item>
-        <item>da</item>
-        <item>de</item>
-        <item>luo</item>
-        <item>et</item>
-        <item>en</item>
-        <item>es</item>
-        <item>ff</item>
-        <item>ga</item>
-        <item>gl</item>
-        <item>ha</item>
-        <item>hr</item>
-        <item>rw</item>
-        <item>rn</item>
-        <item>sw</item>
-        <item>lv</item>
-        <item>lt</item>
-        <item>hu</item>
-        <item>mt</item>
-        <item>nl</item>
-        <item>no</item>
-        <item>ru</item>
-        <item>ro</item>
-        <item>sk</item>
-        <item>sl</item>
-        <item>so</item>
-        <item>sr</item>
-        <item>vi</item>
-        <item>tr</item>
-        <item>wo</item>
-        <item>yo</item>
-        <item>az</item>
-        <item>eu</item>
-        <item>fr</item>
-        <item>xs</item>
-        <item>zu</item>
-        <item>it</item>
-        <item>uz</item>
-        <item>pl</item>
-        <item>pt</item>
-        <item>sq</item>
-        <item>fi</item>
-        <item>sv</item>
-        <item>is</item>
-        <item>cs</item>
-        <item>ee</item>
-        <item>el</item>
-        <item>be</item>
-        <item>bg</item>
-        <item>ky</item>
-        <item>mk</item>
-        <item>uk</item>
-        <item>ab</item>
-        <item>kk</item>
-        <item>hy</item>
-        <item>he</item>
-        <item>ur</item>
-        <item>ar</item>
-        <item>fa</item>
-        <item>ps</item>
-        <item>hi</item>
-        <item>te</item>
-        <item>kn</item>
-        <item>th</item>
-        <item>am</item>
-        <item>zh</item>
-        <item>ja</item>
-        <item>ko</item>
-    </string-array>
-
-    <string-array name="supported_languages">
-        <item></item>
-        <item>da</item>
-        <item>de</item>
-        <item>en</item>
-        <item>es</item>
-        <item>it</item>
-        <item>no</item>
-        <item>pt</item>
-        <item>sl</item>
-        <item>zh</item>
-    </string-array>
-
-</resources>
+</resources>
\ No newline at end of file
diff --git a/org_apg/res/values/strings.xml b/org_apg/res/values/strings.xml
index 23574f808..aa0a99a30 100644
--- a/org_apg/res/values/strings.xml
+++ b/org_apg/res/values/strings.xml
@@ -86,7 +86,7 @@
     <string name="menu_manageSecretKeys">Manage Secret Keys</string>
     <string name="menu_preferences">Settings</string>
     <string name="menu_importKeys">Import Keys</string>
-    <string name="menu_exportKeys">Export Keys</string>
+    <string name="menu_exportKeys">Export All Keys</string>
     <string name="menu_exportKey">Export Key</string>
     <string name="menu_deleteKey">Delete Key</string>
     <string name="menu_createKey">Create Key</string>
@@ -119,7 +119,6 @@
     <string name="label_passPhraseCacheTtl">Pass Phrase Cache</string>
     <string name="label_messageCompression">Message Compression</string>
     <string name="label_fileCompression">File Compression</string>
-    <string name="label_language">Language</string>
     <string name="label_forceV3Signature">Force V3 Signatures</string>
     <string name="label_keyServers">Key Servers</string>
     <string name="label_keyId">Key ID</string>
@@ -323,16 +322,17 @@
 
 
     <!-- about -->
-    <string name="about_description">Android Privacy Guard (APG) is a OpenPGP implementation for Android.</string>
+    <string name="about_description">Android Privacy Guard (APG) is a OpenPGP implementation for Android.\n\nAPG+ is a fork based on the original APG to introduce more features and a new user interface.</string>
     <string name="about_license">License: Apache License 2.0</string>
     <string name="about_version">Version:</string>
-    <string name="about_developer">Developer: Thialfihar (Main developer), Senecaso (QRCode, send key, sign key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann</string>
+    <string name="about_developer">Developer: Thialfihar (Main developer), Senecaso (QRCode, sign key, upload key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann (APG+ fork)</string>
 
     <!-- Dashboard -->
     <string name="dashboard_manage_keys">Manage Keys</string>
     <string name="dashboard_my_keys">My Keys</string>
-    <string name="dashboard_encrypt_decrypt_file">Encrypt/Decrypt File</string>
-    <string name="dashboard_encrypt_decrypt_text">Encrypt/Decrypt Text</string>
+    <string name="dashboard_encrypt">Encrypt</string>
+    <string name="dashboard_decrypt">Decrypt</string>
     <string name="dashboard_help">Help</string>
+    <string name="dashboard_scan_qrcode">Scan QRCode</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3