diff options
| author | Christian S <christian@pix-art.de> | 2016-01-16 10:59:08 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-16 10:59:08 +0100 |
| commit | 7b6b95caaf193af019b0d606a020a42094db26fa (patch) | |
| tree | 70d9903a8d8bea826826747d4d4687344c4d85e7 /src/main/res | |
| parent | 188e0a118cd0d9d0e009f4b0b062165f60f1a3da (diff) | |
| parent | ca7b3978281451287c052f1c8bc58de85eff6f35 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ceddf390f..ab01aedb0 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -598,4 +598,5 @@ <string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string> <string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string> <string name="disable">Disable</string> + <string name="selection_too_large">The selected area is too large</string> </resources> |