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-rm/strings.xml | |
| parent | 057d88c735d8d0e7dce9714f9db28388501c24e7 (diff) | |
| parent | 0ed03e8e14cf2edcda9ee3ecc604d4e048c8ccf3 (diff) | |
| download | android_packages_apps_DeskClock-1f5a43d0469fce561c311a19c85ac8dd036c4cac.tar.gz android_packages_apps_DeskClock-1f5a43d0469fce561c311a19c85ac8dd036c4cac.tar.bz2 android_packages_apps_DeskClock-1f5a43d0469fce561c311a19c85ac8dd036c4cac.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-rm/strings.xml')
| -rw-r--r-- | res/values-rm/strings.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index fe34274c7..375d9ef0a 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -184,6 +184,11 @@ <skip /> <!-- no translation found for sw_notification_lap_number (3535420316052647126) --> <skip /> + <!-- no translation found for stopwatch_format_set:0 (7855304148648938406) --> + <!-- no translation found for stopwatch_format_set:1 (3964356050933061913) --> + <!-- no translation found for stopwatch_format_set:2 (4906928997138522728) --> + <!-- no translation found for stopwatch_format_set:3 (1167529664702951052) --> + <!-- no translation found for stopwatch_format_set:4 (4383974684898411623) --> <!-- no translation found for Nhours_description:one (371227238759147245) --> <!-- no translation found for Nhours_description:other (7018184076091344797) --> <!-- no translation found for Nminutes_description:one (1001391305885322059) --> @@ -395,8 +400,6 @@ <skip /> <!-- no translation found for city_delete_confirmation (1783441538785676299) --> <skip /> - <!-- no translation found for widget_loading_ms (790841709484678848) --> - <skip /> <!-- no translation found for digital_gadget (2326954556720571358) --> <skip /> </resources> |