diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:27:03 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:27:03 -0800 |
| commit | 637eb43027b69d91fbeca7ca2bf11f58998a9929 (patch) | |
| tree | cc79e1dcc643d6ecf73a00d75231100597089028 | |
| parent | 8a3b33c20e9bfd96922f8c72a38db971b63f95d6 (diff) | |
| parent | b176072652b18f5d169845ef453b968e78a54a57 (diff) | |
| download | android_packages_providers_MediaProvider-637eb43027b69d91fbeca7ca2bf11f58998a9929.tar.gz android_packages_providers_MediaProvider-637eb43027b69d91fbeca7ca2bf11f58998a9929.tar.bz2 android_packages_providers_MediaProvider-637eb43027b69d91fbeca7ca2bf11f58998a9929.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/providers/MediaProvider into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
| -rw-r--r-- | res/values-ca/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-nl/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index ae8b0804..271db61c 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -19,7 +19,7 @@ <string name="uid_label" msgid="999888504096344278">"Multimèdia"</string> <string name="app_label" msgid="581696352855930028">"Emmagatzematge de mitjans"</string> <string name="artist_label" msgid="1181678850424271227">"Intèrpret"</string> - <string name="ringtone_default" msgid="3332469542084549546">"So predeterminat"</string> + <string name="ringtone_default" msgid="3332469542084549546">"To predeterminat"</string> <string name="notification_sound_default" msgid="5309766396223094324">"So de notificació predeterminat"</string> <string name="alarm_sound_default" msgid="6854264112790616066">"So d\'alarma predeterminat"</string> <string name="root_images" msgid="7098113056247445324">"Imatges"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 2c02d148..3b1ac642 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -20,7 +20,7 @@ <string name="app_label" msgid="581696352855930028">"Mediaopslag"</string> <string name="artist_label" msgid="1181678850424271227">"Artiest"</string> <string name="ringtone_default" msgid="3332469542084549546">"Standaardbeltoon"</string> - <string name="notification_sound_default" msgid="5309766396223094324">"Standaard meldingsgeluid"</string> + <string name="notification_sound_default" msgid="5309766396223094324">"Standaardmeldingsgeluid"</string> <string name="alarm_sound_default" msgid="6854264112790616066">"Standaardalarmgeluid"</string> <string name="root_images" msgid="7098113056247445324">"Afbeeldingen"</string> <string name="root_videos" msgid="3304457332406057833">"Video\'s"</string> |