diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 19:07:51 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 19:07:51 -0800 |
| commit | a96c64c80dfa1180fef0e4e5e11379cef029f602 (patch) | |
| tree | 12e0e78eb9abae2b30fc1fa6cd1b2b005193e8bf /res/values-az/cm_strings.xml | |
| parent | 3566d8289d9d70b4581c170f01544011054dd514 (diff) | |
| parent | f19adb54a1dc0103751f581772983ef77a357457 (diff) | |
| download | android_packages_apps_Camera2-a96c64c80dfa1180fef0e4e5e11379cef029f602.tar.gz android_packages_apps_Camera2-a96c64c80dfa1180fef0e4e5e11379cef029f602.tar.bz2 android_packages_apps_Camera2-a96c64c80dfa1180fef0e4e5e11379cef029f602.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0
Conflicts:
res/values-az/cm_strings.xml
res/values-in/cm_strings.xml
res/values-it/cm_strings.xml
res/values-iw/cm_strings.xml
res/values-ku/qcomstrings.xml
res/values-nb/cm_strings.xml
res/values-pl/cm_strings.xml
res/values-sk/cm_strings.xml
res/values-th/cm_strings.xml
res/values/qcomarrays.xml
res/values/qcomstrings.xml
Change-Id: Ib4294c621052fdd02ba3ab715deda052432d2fd0
Diffstat (limited to 'res/values-az/cm_strings.xml')
| -rw-r--r-- | res/values-az/cm_strings.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml index e86af7ce6..c777ebf60 100644 --- a/res/values-az/cm_strings.xml +++ b/res/values-az/cm_strings.xml @@ -24,22 +24,16 @@ <string name="pref_camera_picturesize_entry_11_5mp">11.5M piksel</string> <string name="pref_camera_picturesize_entry_10_4mp">10.4M piksel</string> <string name="pref_camera_picturesize_entry_10mp">10M piksel</string> - <string name="pref_camera_picturesize_entry_9_7mp">9.7M piksel</string> <string name="pref_camera_picturesize_entry_9mp">9M piksel</string> - <string name="pref_camera_picturesize_entry_8_2mp">8.2M piksel</string> <string name="pref_camera_picturesize_entry_7_7mp">7.7M piksel</string> <string name="pref_camera_picturesize_entry_6_4mp">6.4M piksel</string> - <string name="pref_camera_picturesize_entry_6mp">6M piksel</string> <string name="pref_camera_picturesize_entry_4_5mp">4.5M piksel</string> <string name="pref_camera_picturesize_entry_4mp">4M piksel</string> - <string name="pref_camera_picturesize_entry_3_7mp">3.7M piksel</string> <string name="pref_camera_picturesize_entry_2_5mp">2.5M piksel</string> - <string name="pref_camera_picturesize_entry_2_1mp">2.1M piksel</string> <string name="pref_camera_picturesize_entry_1_9mp">1.9M piksel</string> <string name="pref_camera_picturesize_entry_wxga">WXGA</string> <string name="pref_camera_picturesize_entry_xga">XGA</string> <string name="pref_camera_picturesize_entry_svga">SVGA</string> - <string name="pref_camera_picturesize_entry_nhd">nHD</string> <string name="pref_camera_picturesize_entry_wvga">WVGA</string> <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string> <string name="pref_camera_scenemode_entry_antimotionblur">Hərəkət bulanıqlığı azaldılması</string> |