diff options
author | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
---|---|---|
committer | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
commit | 1a34cc1e3ebf152505ed591787a7778744020bbd (patch) | |
tree | 4dc3054b63ef53b32ba0591aca8c317b8cd2cd8d /app/src/main/res | |
parent | 2fbf5a2cadabb503306af4a59c1f98596784e488 (diff) | |
parent | 77879cf10f7857b95c968446f5ce9e0437bceb0f (diff) |
solved merge conflict
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/drawable/ic_menu_color_point.png | bin | 0 -> 2454 bytes | |||
-rw-r--r-- | app/src/main/res/drawable/ic_menu_default.png | bin | 0 -> 2454 bytes | |||
-rw-r--r-- | app/src/main/res/values/strings.xml | 5 |
3 files changed, 5 insertions, 0 deletions
diff --git a/app/src/main/res/drawable/ic_menu_color_point.png b/app/src/main/res/drawable/ic_menu_color_point.png Binary files differnew file mode 100644 index 00000000..ef4b0e51 --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_color_point.png diff --git a/app/src/main/res/drawable/ic_menu_default.png b/app/src/main/res/drawable/ic_menu_default.png Binary files differnew file mode 100644 index 00000000..e0d29163 --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_default.png diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 77bac436..968ac2e0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -114,4 +114,9 @@ <string name="do_not_show_again">Do not show again.</string> <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on."</string> <string name="title_activity_provider_add">ProviderAddActivity</string> + <string name="donate_title">Donate</string> + <string name="donate_default_message">Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string> + <string name="donate_message">LEAP depends on donations and grants. Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string> + <string name="donate_button_remind_later">Remind me later</string> + <string name="donate_button_donate">Donate</string> </resources> |