diff options
author | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-05 20:36:42 -0600 |
---|---|---|
committer | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-05 20:36:42 -0600 |
commit | 47b60d546a0e6484bd7e0a399e45f58119bc039c (patch) | |
tree | f46fbc20255e7e9559180d8c4e17a34c095677c4 | |
parent | 566f4a07e2e676af13485ee25491de105459ce64 (diff) | |
parent | 98d4aea6e1904ca257440ce8dfa1a8cd6388c6ad (diff) | |
download | android_packages_wallpapers_LivePicker-47b60d546a0e6484bd7e0a399e45f58119bc039c.tar.gz android_packages_wallpapers_LivePicker-47b60d546a0e6484bd7e0a399e45f58119bc039c.tar.bz2 android_packages_wallpapers_LivePicker-47b60d546a0e6484bd7e0a399e45f58119bc039c.zip |
Merge tag 'android-7.1.1_r4' into cm-14.1
Android 7.1.1 release 4
# gpg: Signature made Thu Dec 1 13:07:06 2016 CST
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
-rw-r--r-- | res/values-fr-rCA/strings.xml | 2 | ||||
-rw-r--r-- | res/values-fr/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index c92638c..ebafd1d 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -25,7 +25,7 @@ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Aperçu du fond d\'écran animé"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Paramètres…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Sélectionner"</string> - <string name="live_wallpaper_empty" msgid="4278728108785853407">"Aucun fond d\'écran animé"</string> + <string name="live_wallpaper_empty" msgid="4278728108785853407">"Aucun fond d\'écran animé."</string> <string name="set_live_wallpaper" msgid="2381437614949033266">"Sélectionner"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Chargement du fond d\'écran animé…"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 93d4944..ebafd1d 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -25,7 +25,7 @@ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Aperçu du fond d\'écran animé"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Paramètres…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Sélectionner"</string> - <string name="live_wallpaper_empty" msgid="4278728108785853407">"Sans fond d\'écran animé"</string> + <string name="live_wallpaper_empty" msgid="4278728108785853407">"Aucun fond d\'écran animé."</string> <string name="set_live_wallpaper" msgid="2381437614949033266">"Sélectionner"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Chargement du fond d\'écran animé…"</string> |