Merge "Clearer charging text"

    <!-- When the lock screen is showing, the phone is plugged in and the battery is fully

         charged, say that it is charged. -->

    <string name="keyguard_charged">Charged</string>

    <string name="keyguard_charged">Fully charged</string>

    <!-- When the lock screen is showing and the phone plugged in, and the battery

         is not fully charged, say that it's charging.  -->