diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
| commit | 1f5a43d0469fce561c311a19c85ac8dd036c4cac (patch) | |
| tree | 3b3ce44c9eccb23e898ee53c45c3e9bac1962fb7 /res/values-fr/strings.xml | |
| parent | 057d88c735d8d0e7dce9714f9db28388501c24e7 (diff) | |
| parent | 0ed03e8e14cf2edcda9ee3ecc604d4e048c8ccf3 (diff) | |
| download | android_packages_apps_DeskClock-mr1.1-staging.tar.gz android_packages_apps_DeskClock-mr1.1-staging.tar.bz2 android_packages_apps_DeskClock-mr1.1-staging.zip | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/DeskClock into 1.1mr1.1-staging
Android 4.2.2 release 1
Conflicts:
res/xml/settings.xml
src/com/android/deskclock/AlarmAlertFullScreen.java
src/com/android/deskclock/AlarmKlaxon.java
src/com/android/deskclock/DeskClock.java
src/com/android/deskclock/SettingsActivity.java
Change-Id: Ieba9c47923469713cf14c310044fe8fb3b31523c
Diffstat (limited to 'res/values-fr/strings.xml')
| -rw-r--r-- | res/values-fr/strings.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index e414ffd4f..f8bddfd9d 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -148,6 +148,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Mon heure est <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Temps de circuit :"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Tour <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 heure"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> heures"</item> @@ -187,8 +194,8 @@ </plurals> <string name="home_label" msgid="4436139365695453870">"Domicile"</string> <string name="cities_activity_title" msgid="8552462751129256730">"Villes"</string> - <string name="alarm_on" msgid="4344630320756422804">"ACTIVÉE"</string> - <string name="alarm_off" msgid="6478058633710013612">"DÉSACTIVÉE"</string> + <string name="alarm_on" msgid="4344630320756422804">"OUI"</string> + <string name="alarm_off" msgid="6478058633710013612">"NON"</string> <string name="clock_settings" msgid="8887845806151785393">"HORLOGE"</string> <string name="clock_style" msgid="2265011060429742344">"Style"</string> <string-array name="clock_style_entries"> |