diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 12:17:00 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 12:17:00 +0000 |
| commit | 3145a6aad3e4a7399251a8c8405d5bf2fe865864 (patch) | |
| tree | 72be6843e174bc36e170d843015c6e3981202edc | |
| parent | 097ce72ac5b429f108e21d7424f6d593d04cf8f8 (diff) | |
| parent | 53603f161a0332711ce8ae23bd237bc40880bfec (diff) | |
| download | android_packages_apps_BasicSmsReceiver-3145a6aad3e4a7399251a8c8405d5bf2fe865864.tar.gz android_packages_apps_BasicSmsReceiver-3145a6aad3e4a7399251a8c8405d5bf2fe865864.tar.bz2 android_packages_apps_BasicSmsReceiver-3145a6aad3e4a7399251a8c8405d5bf2fe865864.zip | |
Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3C
Android 5.1.0 release 1
| -rwxr-xr-x | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/values-sl/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index aa46a07..0be33ab 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -32,7 +32,7 @@ android:hardwareAccelerated="true"> <activity android:name=".DialogSmsDisplay" - android:theme="@android:style/Theme.Holo.Dialog" + android:theme="@android:style/Theme.Material.Light.Dialog" android:launchMode="singleTop" /> <receiver android:name=".SmsMessageReceiver"> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index a82ff8f..77a217b 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="sms_app_name" msgid="3641211328012514267">"Preprosta aplikacija za prejemanje sporočil"</string> + <string name="sms_app_name" msgid="3641211328012514267">"Preprost program za prejemanje sporočil"</string> <string name="sms_message_from_format" msgid="7163240046237558485">"Sporočilo od: <xliff:g id="USERNAME">%1$s</xliff:g>"</string> <string name="sms_done_button" msgid="4063239029747798890">"Dokončano"</string> </resources> |