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-it | |
| 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-it')
| -rw-r--r-- | res/values-it/strings.xml | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 0bd4836..993e172 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -25,8 +25,8 @@ <!-- no translation found for gallery_label (7119609703856708011) --> <skip /> <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Foto"</string> - <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Video fotocamera"</string> - <string name="gallery_camera_media_bucket_name" msgid="5560926838411387511">"Media fotocamera"</string> + <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Video"</string> + <string name="gallery_camera_media_bucket_name" msgid="5560926838411387511">"File fotocamera"</string> <string name="crop_label" msgid="521114301871349328">"Ritaglia foto"</string> <string name="view_label" msgid="4450531507947335704">"Visualizza foto"</string> <string name="preferences_label" msgid="5955678162525051163">"Impostazioni fotocamera"</string> @@ -115,6 +115,10 @@ <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Mostra le foto in ordine casuale"</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">"Qualità video"</string> <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Bassa (per MMS)"</string> <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Alta (per scheda SD)"</string> @@ -129,10 +133,14 @@ <!-- no translation found for pref_camcorder_settings_category (460313486231965141) --> <skip /> <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Dimensioni foto"</string> - <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5 M (2592 x 1936)"</string> - <string name="pref_camera_picturesize_entry_2048x1536" msgid="7304479270077279178">"3M (2048x1536)"</string> - <string name="pref_camera_picturesize_entry_1600x1200" msgid="6722733164421134734">"2M (1600x1200)"</string> - <string name="pref_camera_picturesize_entry_1024x768" msgid="6648351357102402892">"1M (1024x768)"</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">"Dimensioni foto"</string> <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualità immagine"</string> <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super fine"</string> @@ -142,6 +150,8 @@ <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modalità messa a fuoco"</string> <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatico"</string> <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string> + <!-- no translation found for pref_camera_focusmode_entry_macro (4424489110551866161) --> + <skip /> <string name="pref_camera_focusmode_dialogtitle" msgid="3464580667965511167">"Modalità messa a fuoco"</string> <!-- no translation found for pref_camera_flashmode_title (2287362477238791017) --> <skip /> |