diff options
| author | Eric Fischer <enf@google.com> | 2009-09-30 12:01:27 -0700 |
|---|---|---|
| committer | Eric Fischer <enf@google.com> | 2009-09-30 12:01:27 -0700 |
| commit | 0f7aa4b337e25758a1b6e6ea80d2d53c3f0a4466 (patch) | |
| tree | dd62d2fac2e97b814207556bdcaa99dcbb2cc0a1 /res/values-ru | |
| parent | c90610f56293c93f4a7c7a67d8bbf0edb96bc57d (diff) | |
| parent | 4bc220acc9d5582f9c4a979ce4f3c210abe295c3 (diff) | |
| download | LegacyCamera-0f7aa4b337e25758a1b6e6ea80d2d53c3f0a4466.zip LegacyCamera-0f7aa4b337e25758a1b6e6ea80d2d53c3f0a4466.tar.gz LegacyCamera-0f7aa4b337e25758a1b6e6ea80d2d53c3f0a4466.tar.bz2 | |
resolved conflicts for merge of 4bc220ac to eclair
Diffstat (limited to 'res/values-ru')
| -rw-r--r-- | res/values-ru/strings.xml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 61f9abd..331e25a 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -115,6 +115,10 @@ <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Показ фотографий в случайном порядке"</string> <!-- no translation found for pref_camera_recordlocation_title (371208839215448917) --> <skip /> + <!-- no translation found for pref_camera_recordlocation_entry_off (8888142742988946038) --> + <skip /> + <!-- no translation found for pref_camera_recordlocation_entry_on (7954533529969575594) --> + <skip /> <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Качество видео"</string> <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Низкое (для сообщений MMS)"</string> <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Высокое (для SD-карты)"</string> @@ -129,10 +133,14 @@ <!-- no translation found for pref_camcorder_settings_category (460313486231965141) --> <skip /> <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер фотографии"</string> - <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592 x 1936)"</string> - <string name="pref_camera_picturesize_entry_2048x1536" msgid="7304479270077279178">"3M (2048 x 1536)"</string> - <string name="pref_camera_picturesize_entry_1600x1200" msgid="6722733164421134734">"2M (1600 x 1200)"</string> - <string name="pref_camera_picturesize_entry_1024x768" msgid="6648351357102402892">"1M (1024 x 768)"</string> + <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (1871154452633783418) --> + <skip /> + <!-- no translation found for pref_camera_picturesize_entry_2048x1536 (8763841848102861602) --> + <skip /> + <!-- no translation found for pref_camera_picturesize_entry_1600x1200 (3802531502504271124) --> + <skip /> + <!-- no translation found for pref_camera_picturesize_entry_1024x768 (6557686202570581693) --> + <skip /> <string name="pref_camera_picturesize_dialogtitle" msgid="2741153309776113961">"Размер фотографии"</string> <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Качество фотографий"</string> <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Отличное"</string> @@ -142,6 +150,8 @@ <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Режим фокусировки"</string> <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Авто"</string> <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Бесконечность"</string> + <!-- no translation found for pref_camera_focusmode_entry_macro (4424489110551866161) --> + <skip /> <string name="pref_camera_focusmode_dialogtitle" msgid="3464580667965511167">"Режим фокусировки"</string> <!-- no translation found for pref_camera_flashmode_title (2287362477238791017) --> <skip /> |