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-ca/strings.xml | |
| 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-ca/strings.xml')
| -rw-r--r-- | src/main/res/values-ca/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 5b524419..401bf2df 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -97,9 +97,6 @@ <string name="pref_notifications">Notificacions</string> <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string> <string name="pref_vibrate">Vibra</string> - <string name="pref_vibrate_summary">Vibra quan arriba un nou missatge</string> - <string name="pref_sound">So</string> - <string name="pref_sound_summary">Reprodueix el to de trucada amb la notificació</string> <string name="pref_notification_grace_period">Notificació del període d\'espera</string> <string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string> <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string> |