diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:58:40 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:58:40 +0200 |
| commit | ee0264d98c9a348ea29d12796bed25f9ba1494fb (patch) | |
| tree | cc559348547e504d37a6efa7826ea0120070babe /src/main/res/values-sk | |
| parent | d94eb9309b4ab3ee1dfd3cee637b47a52223e15b (diff) | |
| parent | 7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff) | |
Merge branch 'master' into introduce_cplus_database_version
Conflicts:
gradle/wrapper/gradle-wrapper.properties
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res/values-sk')
| -rw-r--r-- | src/main/res/values-sk/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index d7814652..c05749a6 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -100,9 +100,6 @@ <string name="pref_notifications">Upozornenia</string> <string name="pref_notifications_summary">Upozorniť pri prijatí novej správy</string> <string name="pref_vibrate">Vibrovať</string> - <string name="pref_vibrate_summary">Vibrovať pri prijatí novej správy</string> - <string name="pref_sound">Zvuk</string> - <string name="pref_sound_summary">Prehrať zvuk spolu s upozornením</string> <string name="pref_notification_grace_period">Doba na prečítanie upozornenia</string> <string name="pref_notification_grace_period_summary">Neupozorňovať krátko po obdržaní kópie správy</string> <string name="pref_never_send_crash">Neodosielať detaily o zlyhaní aplikácie</string> |