diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-07-09 22:05:48 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-07-09 22:05:48 +0200 |
| commit | c7088489bd339e4b8b5128e909a1b4377864a5c9 (patch) | |
| tree | 56974ad74bfdb025a56e817b952221ce4f2dbbe6 /res/values | |
| parent | 71324261e5560fa70ef028fba35bd121f2527578 (diff) | |
| parent | da79e2cca2ffce6e4e5c3b479c4de702ecca1872 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 382b5471..4ede1c10 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -2,8 +2,10 @@ <resources> <color name="primarytext" type="color">#de000000</color> <color name="secondarytext" type="color">#8a000000</color> + <color name="ondarktext" type="color">#fffafafa</color> <color name="primarybackground" type="color">#fffafafa</color> <color name="secondarybackground" type="color">#ffeeeeee</color> + <color name="darkbackground" type="color">#ff323232</color> <color name="divider">#1f000000</color> <color name="red">#ffe51c23</color> </resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index dcaf58d2..80bd2052 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -252,4 +252,6 @@ <string name="no_muc_server_found">No suitable Conference Server found</string> <string name="your_fingerprint">Your fingerprint</string> <string name="otr_fingerprint">OTR fingerprint</string> + <string name="verify">Verify</string> + <string name="decrypt">Decrypt</string> </resources>
\ No newline at end of file |