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

Commit b9d171ba authored by Jef Oliver's avatar Jef Oliver Committed by Gerrit Code Review
Browse files

Merge "backport: restore the CM ChangeLog in 'about phone'" into ics

parents 938b8d03 11400a11

AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -1399,6 +1399,12 @@ 


        <activity android:name=".cyanogenmod.Calendar" />



        <activity android:name=".cyanogenmod.ChangeLog" android:label="@string/changelog_title">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

            </intent-filter>

        </activity>



        <activity android:name=".profiles.NFCProfile"

                android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

res/values-de/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -2235,6 +2235,14 @@ ice shows the slider widgets before the unlock option [CHAR LIMIT=28]--> 
    <string name="ime_switcher_notify">Auswahl-Benachrichtigung</string>

    <string name="ime_switcher_notify_summary">Benachrichtigung zur Auswahl der Eingabemethode in der Statusleiste anzeigen</string>



    <!-- Change Log strings -->

    <string name="changelog_title">Changelog anzeigen</string>

    <string name="changelog_dialog">Changelog</string>

    <string name="changelog_loading">Changelog wird geladen...</string>

    <string name="changelog_error">Changelog kann nicht geladen werden</string>

    <string name="changelog_unknown">Unbekannt</string>

    <string name="changelog_version">Version</string>



    <!-- Stylus Icon -->

    <string name="stylus_icon_enabled_title">Stift-Symbol</string>

    <string name="stylus_icon_enabled_summary">Zeiger einblenden, wenn ein Stift verwendet wird</string>

res/values-es/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -2194,6 +2194,15 @@ 
    <string name="mod_version_default">"Desconocida"</string>

    <!-- About device screen, build date of ROM. #CM -->

    <string name="build_date">"Fecha de compilación"</string>



    <!-- Change Log strings #CM -->

    <string name="changelog_title">Mostrar registro de cambios</string>

    <string name="changelog_dialog">Registro de cambios</string>

    <string name="changelog_loading">Cargando registro de cambios\u2026</string>

    <string name="changelog_error">Imposible cargar el registro de cambios</string>

    <string name="changelog_unknown">Desconocido</string>

    <string name="changelog_version">Versión</string>



    <!-- Stylus Icon -->

    <string name="stylus_icon_enabled_title">Mostrar icono al usar Stylus</string>

    <string name="stylus_icon_enabled_summary">Mostrar el cursor cuando se arrastra o dibuja con Stylus</string>

res/values-fr/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -1226,6 +1226,14 @@ 
    <string name="preview_country_title">Pays</string>

    <string name="preview_carrier_title">Opérateur</string>



    <!-- Change Log strings -->

    <string name="changelog_title">Voir changelog</string>

    <string name="changelog_dialog">Changelog</string>

    <string name="changelog_loading">Chargement du changelog...</string>

    <string name="changelog_error">Impossible de charger le changelog</string>

    <string name="changelog_unknown">Inconnu</string>

    <string name="changelog_version">Version</string>



    <!-- Dock settings screen # -->

    <string name="dock_usb_audio_enable_title">Audio sur station d\'accueil</string>

    <!-- Enable Dock USB Audio, setting option summary text when check box is selected -->

res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -1782,6 +1782,14 @@ 
    <string name="preview_country_title">Country</string>

    <string name="preview_carrier_title">Carrier</string>



    <!-- Change Log strings #CM -->

    <string name="changelog_title">View changelog</string>

    <string name="changelog_dialog">Changelog</string>

    <string name="changelog_loading">Loading changelog...</string>

    <string name="changelog_error">Unable to load changelog</string>

    <string name="changelog_unknown">Unknown</string>

    <string name="changelog_version">Version</string>



    <!-- Display : Rotation #CM -->

    <string name="display_rotation_title">Rotation</string>

    <string name="display_rotation_enabled">Enabled.</string>