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

Commit ff8587d3 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Frameworks/base: move custom string in cm_strings.xml file" into cm-10.2

parents c8b9de67 e03e1064

core/res/res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ 


    <string name="lockscreen_discharging">Discharging, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>



    <!-- Text for progress dialog while formatting SD card [CHAR LIMIT=NONE] -->

    <string name="progress_nomediapresent" product="default">No removable media present\u2026</string>



    <!-- Storage description for the SD card on the dock. [CHAR LIMIT=NONE] -->

    <string name="storage_sd_dock_card">Dock SD card</string>

core/res/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -3618,8 +3618,6 @@ 
    <string name="progress_unmounting" product="nosdcard">Unmounting USB storage\u2026</string>

    <!-- Text for progress dialog while unmounting SD card [CHAR LIMIT=NONE] -->

    <string name="progress_unmounting" product="default">Unmounting SD card\u2026</string>

    <!-- Text for progress dialog while formatting SD card [CHAR LIMIT=NONE] -->

    <string name="progress_nomediapresent" product="default">No removable media present\u2026</string>

    <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->

    <string name="progress_erasing" product="nosdcard">Erasing USB storage\u2026</string>

    <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->