diff --git a/res/values/strings.xml b/res/values/strings.xml index 40748570f1..5a759be3b4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -417,7 +417,7 @@ %s called you Called %s Missed call from %s - %s joined Signal! + %s is on Signal! You set disappearing message time to %1$s. %1$s set disappearing message time to %2$s. Your safety number with %s has changed. @@ -594,7 +594,7 @@ Called you Missed call Media message - %s joined Signal! + %s is on Signal! Disappearing message time set to %s Safety number changed Your safety number with %s has changed. diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java index 8f21299871..e165ebdb88 100644 --- a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java @@ -98,7 +98,7 @@ public class ThreadRecord extends DisplayRecord { } else if (SmsDatabase.Types.isMissedCall(type)) { return emphasisAdded(context.getString(org.thoughtcrime.securesms.R.string.ThreadRecord_missed_call)); } else if (SmsDatabase.Types.isJoinedType(type)) { - return emphasisAdded(context.getString(R.string.ThreadRecord_s_joined_signal, getRecipients().getPrimaryRecipient().toShortString())); + return emphasisAdded(context.getString(R.string.ThreadRecord_s_is_on_signal, getRecipients().getPrimaryRecipient().toShortString())); } else if (SmsDatabase.Types.isExpirationTimerUpdate(type)) { String time = ExpirationUtil.getExpirationDisplayValue(context, (int) (getExpiresIn() / 1000)); return emphasisAdded(context.getString(R.string.ThreadRecord_disappearing_message_time_updated_to_s, time));