Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b7e256d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Some updates for better localization"

parents 3870e6a8 98cc4f13
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -9073,6 +9073,10 @@
    <!-- Configure notifications: Title for determining which notifications appear on the lock screen [CHAR LIMIT=60] -->
    <string name="lock_screen_notifs_title">Notifications on lock screen</string>
    <!-- Configure notifications: summary for lockscreen notifications: all notifications shown
    regardless of noisiness [CHAR LIMIT=60] -->
    <string name="lock_screen_notifs_show_all_summary">Show conversations, default, and silent</string>
    <!-- Configure notifications: Value for lockscreen notifications: all notifications shown
    regardless of noisiness [CHAR LIMIT=60] -->
    <string name="lock_screen_notifs_show_all">Show conversations, default, and silent</string>
@@ -9324,11 +9328,11 @@
    <!-- app summary of notification app list screen [CHAR LIMIT=100] -->
    <plurals name="notifications_sent_daily">
        <item quantity="one">~<xliff:g id="number">%d</xliff:g> notification per day</item>
        <item quantity="other">~<xliff:g id="number">%d</xliff:g> notifications per day</item>
        <item quantity="other">~<xliff:g id="number">%,d</xliff:g> notifications per day</item>
    </plurals>
    <plurals name="notifications_sent_weekly">
        <item quantity="one">~<xliff:g id="number">%d</xliff:g> notification per week</item>
        <item quantity="other">~<xliff:g id="number">%d</xliff:g> notifications per week</item>
        <item quantity="other">~<xliff:g id="number">%,d</xliff:g> notifications per week</item>
    </plurals>
    <!-- app summary of notification app list screen [CHAR LIMIT=100] -->
    <string name="notifications_sent_never">Never</string>
+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class ShowOnLockScreenNotificationPreferenceController extends AbstractPr
        } else if (!getLockscreenSilentNotificationsEnabled()) {
            return mContext.getString(R.string.lock_screen_notifs_show_alerting);
        } else {
            return mContext.getString(R.string.lock_screen_notifs_show_all);
            return mContext.getString(R.string.lock_screen_notifs_show_all_summary);
        }
    }