diff options
| author | Ryan Hansberry <rhansby@gmail.com> | 2015-09-22 14:02:21 -0700 |
|---|---|---|
| committer | Ryan Hansberry <rhansby@gmail.com> | 2015-09-22 14:02:21 -0700 |
| commit | 757b43a3e16b9f0687be9215f2cdc203fda98431 (patch) | |
| tree | ddb7fffedd83957c80b8d2f1eb72148cfc97c391 /app/src/main/res/values | |
| parent | 0f293ab7927470ab3a2d78064cc3c66e2523415f (diff) | |
| parent | ea5c3e8b7f1926af45921d35d79fb6dca63b5fd3 (diff) | |
| download | connectbot-757b43a3e16b9f0687be9215f2cdc203fda98431.tar.gz connectbot-757b43a3e16b9f0687be9215f2cdc203fda98431.tar.bz2 connectbot-757b43a3e16b9f0687be9215f2cdc203fda98431.zip | |
Merge branch 'master' into convert-activities-to-appcompat
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/colors.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 299b896..e61a9e8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -27,4 +27,9 @@ <color name="primary">#00BCD4</color> <color name="accent">#F4511E</color> + <color name="dark_accent">#BF360C</color> + + <color name="fab_color_pressed">#F4511E</color> + <color name="fab_color_normal">#F4511E</color> + </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4820846..1b786b3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -152,6 +152,8 @@ <!-- Add a new item (e.g., host or pubkey) to the list. --> <string name="button_add">"Add"</string> + <!-- Cancel an action. --> + <string name="button_cancel">Cancel</string> <!-- Change an existing item's (e.g., host or pubkey) details. --> <string name="button_change">"Change"</string> <!-- Button that begins the generation of a public key pair. --> |