diff options
| author | Beriain <beriain@bitmessage.ch> | 2014-05-06 16:56:59 +0200 |
|---|---|---|
| committer | Beriain <beriain@bitmessage.ch> | 2014-05-06 16:56:59 +0200 |
| commit | b8023b4dfc192fe2d019c993f17d417f2b6e91ab (patch) | |
| tree | 3d812373324e928af943fecfca8e993672149960 /res/values | |
| parent | 86887274c7eb77b77417ce9c20a50502fa80fe24 (diff) | |
| parent | f7033cb7e06740576d23e1f8fbf473db337e13fe (diff) | |
Merge https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 36 |
3 files changed, 10 insertions, 35 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml deleted file mode 100644 index 55c1e590..00000000 --- a/res/values/dimens.xml +++ /dev/null @@ -1,7 +0,0 @@ -<resources> - - <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="activity_horizontal_margin">16dp</dimen> - <dimen name="activity_vertical_margin">16dp</dimen> - -</resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index f4b7d5fa..fa41b7b8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -80,7 +80,7 @@ <string name="send_unencrypted">Send unencrypted</string> <string name="decryption_failed">Decrpytion failed. Maybe you don’t have the proper private key.</string> <string name="openkeychain_required">OpenKeychain</string> - <string name="openkeychain_required_long">Conversations utilizes a third party called <b>OpenKeychain</b> to encrypt and decrypt messages and to mange your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\nTo use openPGP please install the app and then restart Conversations.</string> + <string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to mange your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string> <string name="restart">Restart</string> <string name="install">Install</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 20cfcf1d..1468283e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,24 +1,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- - Base application theme, dependent on API level. This theme is replaced - by AppBaseTheme from res/values-vXX/styles.xml on newer devices. - --> - <style name="AppBaseTheme" parent="android:Theme.Light"> - <!-- - Theme customizations available in newer API levels can go in - res/values-vXX/styles.xml, while customizations related to - backward-compatibility can go here. - --> - </style> - - <!-- Application theme. --> - <style name="AppTheme" parent="AppBaseTheme"> - <!-- All customizations that are NOT specific to a particular API-level can go here. --> - </style> - - - <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView"> + <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView"> <item name="android:drawableBottom">@drawable/section_header</item> <item name="android:drawablePadding">4dp</item> <item name="android:layout_marginTop">8dp</item> @@ -27,11 +9,11 @@ <item name="android:textColor">#5b5b5b</item> <item name="android:textStyle">bold</item> </style> - - <style name="Divider"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">1.5dp</item> - <item name="android:background">#b7b7b7</item> - </style> - -</resources> + + <style name="Divider"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">1.5dp</item> + <item name="android:background">#b7b7b7</item> + </style> + +</resources>
\ No newline at end of file |