summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-ca/cm_strings.xml108
-rw-r--r--res/values-el/cm_strings.xml105
-rw-r--r--res/values-hu/cm_strings.xml100
-rw-r--r--res/values-it/cm_strings.xml100
-rw-r--r--res/values/colors.xml2
-rw-r--r--src/com/android/camera/PhotoMenu.java23
-rw-r--r--src/com/android/camera/PhotoModule.java4
-rw-r--r--src/com/android/camera/PhotoUI.java10
-rw-r--r--src/com/android/camera/VideoUI.java10
-rw-r--r--src/com/android/camera/ui/CameraRootView.java6
10 files changed, 433 insertions, 35 deletions
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index fb01ea4d5..6de2b9413 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -16,9 +16,16 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pref_camera_storage_title">Emmagatzematge</string>
+ <string name="pref_camera_picturesize_entry_20_7mp">20.7M pixels</string>
+ <string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
<string name="pref_camera_picturesize_entry_12_8mp">12.8M píxels</string>
+ <string name="pref_camera_picturesize_entry_12_7mp">12.7M pixels</string>
+ <string name="pref_camera_picturesize_entry_12mp">12M pixels (4:3)</string>
<string name="pref_camera_picturesize_entry_11_5mp">11.5M píxels</string>
+ <string name="pref_camera_picturesize_entry_10_4mp">10.4M pixels</string>
<string name="pref_camera_picturesize_entry_9mp">9M píxels</string>
+ <string name="pref_camera_picturesize_entry_8_2mp">8.2M pixels</string>
+ <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixels (4:3)</string>
<string name="pref_camera_picturesize_entry_6_4mp">6.4M píxels</string>
<string name="pref_camera_picturesize_entry_6mp">6M píxels</string>
<string name="pref_camera_picturesize_entry_4_5mp">4.5M píxels</string>
@@ -38,4 +45,105 @@
<string name="headset_plug">Has d\'endollar els auriculars amb aquests efectes.</string>
<string name="fail_trim">No es pot retallar aquest arxiu de video</string>
<string name="can_not_trim">Només poden ser retallats els arxius mp4</string>
+ <string name="pref_video_quality_entry_hfr">WVGA High Frame Rate</string>
+<string name="pref_camera_scenemode_entry_antimotionblur">Reducció del difuminat del moviment</string>
+ <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
+ <string name="pref_camera_scenemode_entry_ar">Realitat augmentada</string>
+ <string name="pref_camera_scenemode_entry_asd">Millor presa</string>
+ <string name="pref_camera_scenemode_entry_baby">Bebé</string>
+ <string name="pref_camera_scenemode_entry_backgroundblur">Difuminat del fons</string>
+ <string name="pref_camera_scenemode_entry_backlight">Retroiluminació</string>
+ <string name="pref_camera_scenemode_entry_backlightportrait">Retrat amb retroiluminació</string>
+ <string name="pref_camera_scenemode_entry_barcode">Codi de barres</string>
+ <string name="pref_camera_scenemode_entry_beach">Platja</string>
+ <string name="pref_camera_scenemode_entry_beauty">Bellesa</string>
+ <string name="pref_camera_scenemode_entry_candlelight">Espelma</string>
+ <string name="pref_camera_scenemode_entry_cine">Cine</string>
+ <string name="pref_camera_scenemode_entry_closeup">De prop</string>
+ <string name="pref_camera_scenemode_entry_dark">Fosca</string>
+ <string name="pref_camera_scenemode_entry_dish">Plat</string>
+ <string name="pref_camera_scenemode_entry_duskdawn">Matinada/Vespre</string>
+ <string name="pref_camera_scenemode_entry_document">Document</string>
+ <string name="pref_camera_scenemode_entry_fallcolor">Fallcolor</string>
+ <string name="pref_camera_scenemode_entry_fireworks">Focs artificials</string>
+ <string name="pref_camera_scenemode_entry_flowers">Flors</string>
+ <string name="pref_camera_scenemode_entry_handheldtwilight">En penombra a mà</string>
+ <string name="pref_camera_scenemode_entry_highsensitivity">Alta sensibilitat</string>
+ <string name="pref_camera_scenemode_entry_indoor">Interior</string>
+ <string name="pref_camera_scenemode_entry_landscape">Paisatge</string>
+ <string name="pref_camera_scenemode_entry_mix_illuminant">Llums barrejades</string>
+ <string name="pref_camera_scenemode_entry_mood">Humor</string>
+ <string name="pref_camera_scenemode_entry_nightportrait">Retrat de nit</string>
+ <string name="pref_camera_scenemode_entry_nightindoor">Interior de nit</string>
+ <string name="pref_camera_scenemode_entry_oldfilm">Pel·lícula antiga</string>
+ <string name="pref_camera_scenemode_entry_pet">Mascota</string>
+ <string name="pref_camera_scenemode_entry_portrait">Retrat</string>
+ <string name="pref_camera_scenemode_entry_snow">Neu</string>
+ <string name="pref_camera_scenemode_entry_softskin">Pell suau</string>
+ <string name="pref_camera_scenemode_entry_sports">Esports</string>
+ <string name="pref_camera_scenemode_entry_spotlight">Focus</string>
+ <string name="pref_camera_scenemode_entry_steadyphoto">Foto ferma</string>
+ <string name="pref_camera_scenemode_entry_supernight">Negra nit</string>
+ <string name="pref_camera_scenemode_entry_sweepstitch">Punt rastrejat</string>
+ <string name="pref_camera_scenemode_entry_text">Text</string>
+ <string name="pref_camera_scenemode_entry_theatre">Teatre</string>
+ <string name="pref_camera_scenemode_entry_whiteboard">Pissarra</string>
+ <string name="pref_camera_focusmode_entry_continuouspicture">Fotografia contínua</string>
+ <string name="pref_camera_focusmode_entry_extended">Extès</string>
+ <string name="pref_camera_focusmode_entry_facedetect">Detecció de cares</string>
+ <string name="pref_camera_focusmode_entry_facepriority">Prioritat de cares</string>
+ <string name="pref_camera_focusmode_entry_fixed">Fixat</string>
+ <string name="pref_camera_focusmode_entry_portrait">Retrat</string>
+ <string name="pref_camera_focusmode_entry_hyperfocal">Hiperfocal</string>
+ <string name="pref_camera_power_shutter_title">Energia del disparador</string>
+ <string name="pref_camera_iso_entry_auto">Auto</string>
+ <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+ <string name="pref_camera_iso_entry_isosports">Esports</string>
+ <string name="pref_camera_iso_entry_isonight">Nit</string>
+ <string name="pref_camera_iso_entry_isomovie">Pel·lícula</string>
+ <string name="pref_camera_jpeg_title">Qualitat JPEG</string>
+ <string name="pref_video_jpeg_title">Qualitat de codificació</string>
+ <string name="pref_camera_jpeg_entry_super">Super</string>
+ <string name="pref_camera_jpeg_entry_high">Alta</string>
+ <string name="pref_camera_jpeg_entry_medium">Mitja</string>
+ <string name="pref_camera_jpeg_entry_low">Baixa</string>
+ <string name="pref_camera_coloreffect_title">Efecte de color</string>
+ <string name="pref_camera_coloreffect_entry_none">Cap</string>
+ <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+ <string name="pref_camera_coloreffect_entry_sepia">Sèpia</string>
+ <string name="pref_camera_coloreffect_entry_negative">Negatiu</string>
+ <string name="pref_camera_coloreffect_entry_solarize">Solaritza</string>
+ <string name="pref_camera_coloreffect_entry_posterize">Posteritza</string>
+ <string name="pref_camera_coloreffect_entry_aqua">Aqua</string>
+ <string name="pref_camera_coloreffect_entry_emboss">Relleu</string>
+ <string name="pref_camera_coloreffect_entry_sketch">Croquis</string>
+ <string name="pref_camera_coloreffect_entry_neon">Neó</string>
+ <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
+ <string name="pref_camera_coloreffect_entry_mosaic">Mosaic</string>
+ <string name="pref_camera_coloreffect_entry_redtint">Tinta vermella</string>
+ <string name="pref_camera_coloreffect_entry_bluetint">Tinta blava</string>
+ <string name="pref_camera_coloreffect_entry_greentint">Tinta verda</string>
+ <string name="pref_camera_coloreffect_entry_washed">Rentat</string>
+ <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage calent</string>
+ <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage fred</string>
+ <string name="pref_camera_coloreffect_entry_point_blue">Punt blau</string>
+ <string name="pref_camera_coloreffect_entry_point_green">Punt verd</string>
+ <string name="pref_camera_coloreffect_entry_point_red_yellow">Punt vermell-groc</string>
+ <string name="pref_camera_coloreffect_entry_cartoonize">Encartrona</string>
+ <string name="pref_camera_burst_title">Mode ràfaga</string>
+ <string name="pref_camera_burst_entry_off">Desactivat</string>
+ <string name="pref_camera_burst_entry_5">5 fotos</string>
+ <string name="pref_camera_burst_entry_10">10 fotos</string>
+ <string name="pref_camera_burst_entry_15">15 fotos</string>
+ <string name="pref_camera_burst_entry_20">20 fotos</string>
+ <string name="pref_camera_focustime_title">Duració del focus tàctil</string>
+ <string name="pref_camera_focustime_summary">Selecciona la duració del focus tàctil</string>
+ <string name="pref_camera_focustime_entry_5">5s</string>
+ <string name="pref_camera_focustime_entry_10">10s</string>
+ <string name="pref_camera_focustime_entry_15">15s</string>
+ <string name="pref_camera_focustime_entry_20">20s</string>
+ <string name="pref_camera_focustime_entry_30">30s</string>
+ <string name="pref_camera_focustime_entry_infinite">Infinit</string>
+ <string name="pref_camera_flashmode_entry_redeye">Ulls vermells</string>
+ <string name="pref_camera_flashmode_label_redeye">ULLS VERMELLS</string>
</resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 2af28ca2c..42df6abba 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -19,9 +19,13 @@
<string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
<string name="pref_camera_picturesize_entry_18mp">18 MP</string>
<string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
+ <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
+ <string name="pref_camera_picturesize_entry_12mp">12 MP (4:3)</string>
<string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
+ <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
<string name="pref_camera_picturesize_entry_9mp">9 MP</string>
<string name="pref_camera_picturesize_entry_8_2mp">8.2 MP</string>
+ <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP (4:3)</string>
<string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
<string name="pref_camera_picturesize_entry_6mp">6 MP</string>
<string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
@@ -41,4 +45,105 @@
<string name="headset_plug">Συνδέστε τα ακουστικά για αυτά τα εφέ.</string>
<string name="fail_trim">Δυστυχώς δεν είναι δυνατή η περικοπή αυτού του αρχείου βίντεο</string>
<string name="can_not_trim">Μόνο αρχεία mp4 μπορούν να περικοπούν</string>
+ <string name="pref_video_quality_entry_hfr">WVGA υψηλού ρυθμού καρέ</string>
+ <string name="pref_camera_scenemode_entry_antimotionblur">Μείωση motion blur</string>
+ <string name="pref_camera_scenemode_entry_aqua">Νερό</string>
+ <string name="pref_camera_scenemode_entry_ar">Επαυξημένη πραγματικότητα</string>
+ <string name="pref_camera_scenemode_entry_asd">Καλύτερη λήψη</string>
+ <string name="pref_camera_scenemode_entry_baby">Μωρό</string>
+ <string name="pref_camera_scenemode_entry_backgroundblur">Θολό παρασκήνιο</string>
+ <string name="pref_camera_scenemode_entry_backlight">Οπίσθιος φωτισμός</string>
+ <string name="pref_camera_scenemode_entry_backlightportrait">Πορτραίτο με οπίσθιο φωτισμό</string>
+ <string name="pref_camera_scenemode_entry_barcode">Barcode</string>
+ <string name="pref_camera_scenemode_entry_beach">Παραλία</string>
+ <string name="pref_camera_scenemode_entry_beauty">Ομορφιά</string>
+ <string name="pref_camera_scenemode_entry_candlelight">Φως κεριού</string>
+ <string name="pref_camera_scenemode_entry_cine">Σινεμά</string>
+ <string name="pref_camera_scenemode_entry_closeup">Κοντινό</string>
+ <string name="pref_camera_scenemode_entry_dark">Σκοτάδι</string>
+ <string name="pref_camera_scenemode_entry_dish">Πιάτο</string>
+ <string name="pref_camera_scenemode_entry_duskdawn">Αυγή/Σούρουπο</string>
+ <string name="pref_camera_scenemode_entry_document">Έγγραφο</string>
+ <string name="pref_camera_scenemode_entry_fallcolor">Fallcolor</string>
+ <string name="pref_camera_scenemode_entry_fireworks">Πυροτεχνήματα</string>
+ <string name="pref_camera_scenemode_entry_flowers">Λουλούδια</string>
+ <string name="pref_camera_scenemode_entry_handheldtwilight">Λυκόφως</string>
+ <string name="pref_camera_scenemode_entry_highsensitivity">Υψηλή ευαισθησία</string>
+ <string name="pref_camera_scenemode_entry_indoor">Εσωτερικός χώρος</string>
+ <string name="pref_camera_scenemode_entry_landscape">Τοπίο</string>
+ <string name="pref_camera_scenemode_entry_mix_illuminant">Μεικτός φωτισμός</string>
+ <string name="pref_camera_scenemode_entry_mood">Διάθεση</string>
+ <string name="pref_camera_scenemode_entry_nightportrait">Νυχτερινό πορτραίτο</string>
+ <string name="pref_camera_scenemode_entry_nightindoor">Νύχτα σε εσωτ. χώρο</string>
+ <string name="pref_camera_scenemode_entry_oldfilm">Παλιό φιλμ</string>
+ <string name="pref_camera_scenemode_entry_pet">Κατοικίδιο</string>
+ <string name="pref_camera_scenemode_entry_portrait">Πορτραίτο</string>
+ <string name="pref_camera_scenemode_entry_snow">Χιόνι</string>
+ <string name="pref_camera_scenemode_entry_softskin">Απαλό δέρμα</string>
+ <string name="pref_camera_scenemode_entry_sports">Αθλήματα</string>
+ <string name="pref_camera_scenemode_entry_spotlight">Προβολέας</string>
+ <string name="pref_camera_scenemode_entry_steadyphoto">Σταθερή φωτογραφία</string>
+ <string name="pref_camera_scenemode_entry_supernight">Απόλυτο σκοτάδι</string>
+ <string name="pref_camera_scenemode_entry_sweepstitch">Λειτουργία sweep</string>
+ <string name="pref_camera_scenemode_entry_text">Κείμενο</string>
+ <string name="pref_camera_scenemode_entry_theatre">Θέατρο</string>
+ <string name="pref_camera_scenemode_entry_whiteboard">Άσπρος πίνακας</string>
+ <string name="pref_camera_focusmode_entry_continuouspicture">Συνεχής - Εικόνα</string>
+ <string name="pref_camera_focusmode_entry_extended">Εκτεταμένη</string>
+ <string name="pref_camera_focusmode_entry_facedetect">Εντοπισμός προσώπου</string>
+ <string name="pref_camera_focusmode_entry_facepriority">Προτεραιότητα προσώπου</string>
+ <string name="pref_camera_focusmode_entry_fixed">Σταθερή</string>
+ <string name="pref_camera_focusmode_entry_portrait">Πορτραίτο</string>
+ <string name="pref_camera_focusmode_entry_hyperfocal">Υπερ-εστίαση</string>
+ <string name="pref_camera_power_shutter_title">Κλείστρο power</string>
+ <string name="pref_camera_iso_entry_auto">Αυτόματο</string>
+ <string name="pref_camera_iso_entry_isodeblur">Αυτόματο (HJR)</string>
+ <string name="pref_camera_iso_entry_isosports">Αθλήματα</string>
+ <string name="pref_camera_iso_entry_isonight">Νύχτα</string>
+ <string name="pref_camera_iso_entry_isomovie">Ταινία</string>
+ <string name="pref_camera_jpeg_title">Ποιότητα JPEG</string>
+ <string name="pref_video_jpeg_title">Ποιότητα κωδικοποίησης</string>
+ <string name="pref_camera_jpeg_entry_super">Τέλεια</string>
+ <string name="pref_camera_jpeg_entry_high">Υψηλή</string>
+ <string name="pref_camera_jpeg_entry_medium">Μέτρια</string>
+ <string name="pref_camera_jpeg_entry_low">Χαμηλή</string>
+ <string name="pref_camera_coloreffect_title">Εφέ χρώματος</string>
+ <string name="pref_camera_coloreffect_entry_none">Κανένα</string>
+ <string name="pref_camera_coloreffect_entry_mono">Μονόχρωμο</string>
+ <string name="pref_camera_coloreffect_entry_sepia">Σέπια</string>
+ <string name="pref_camera_coloreffect_entry_negative">Αρνητικό</string>
+ <string name="pref_camera_coloreffect_entry_solarize">Υπερφωτισμός</string>
+ <string name="pref_camera_coloreffect_entry_posterize">Ποστεροποίηση</string>
+ <string name="pref_camera_coloreffect_entry_aqua">Νερό</string>
+ <string name="pref_camera_coloreffect_entry_emboss">Ξεθώριασμα</string>
+ <string name="pref_camera_coloreffect_entry_sketch">Σκίτσο</string>
+ <string name="pref_camera_coloreffect_entry_neon">Neon</string>
+ <string name="pref_camera_coloreffect_entry_pastel">Παστέλ</string>
+ <string name="pref_camera_coloreffect_entry_mosaic">Μωσαϊκό</string>
+ <string name="pref_camera_coloreffect_entry_redtint">Κόκκινη απόχρωση</string>
+ <string name="pref_camera_coloreffect_entry_bluetint">Μπλε απόχρωση</string>
+ <string name="pref_camera_coloreffect_entry_greentint">Πράσινη απόχρωση</string>
+ <string name="pref_camera_coloreffect_entry_washed">Ξεθωριασμένο</string>
+ <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage θερμό</string>
+ <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage ψυχρό</string>
+ <string name="pref_camera_coloreffect_entry_point_blue">Επισήμανση μπλε</string>
+ <string name="pref_camera_coloreffect_entry_point_green">Επισήμανση πράσινου</string>
+ <string name="pref_camera_coloreffect_entry_point_red_yellow">Επισήμανση κόκκινου-κίτρινου</string>
+ <string name="pref_camera_coloreffect_entry_cartoonize">Κινούμενα σχέδια</string>
+ <string name="pref_camera_burst_title">Λειτουργία ριπής</string>
+ <string name="pref_camera_burst_entry_off">Απενεργοποιημένη</string>
+ <string name="pref_camera_burst_entry_5">5 λήψεις</string>
+ <string name="pref_camera_burst_entry_10">10 λήψεις</string>
+ <string name="pref_camera_burst_entry_15">15 λήψεις</string>
+ <string name="pref_camera_burst_entry_20">20 λήψεις</string>
+ <string name="pref_camera_focustime_title">Διάρκεια εστίασης αγγίγματος</string>
+ <string name="pref_camera_focustime_summary">Επιλογή διάρκειας για την εστίαση με άγγιγμα</string>
+ <string name="pref_camera_focustime_entry_5">5δ</string>
+ <string name="pref_camera_focustime_entry_10">10δ</string>
+ <string name="pref_camera_focustime_entry_15">15δ</string>
+ <string name="pref_camera_focustime_entry_20">20δ</string>
+ <string name="pref_camera_focustime_entry_30">30δ</string>
+ <string name="pref_camera_focustime_entry_infinite">Απεριόριστο</string>
+ <string name="pref_camera_flashmode_entry_redeye">Κόκκινα μάτια</string>
+ <string name="pref_camera_flashmode_label_redeye">ΚΟΚΚΙΝΑ ΜΑΤΙΑ</string>
</resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 6c7f366e8..4dcf9d6c8 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -45,4 +45,104 @@
<string name="fail_trim">Ez a videófájl nem vágható</string>
<string name="can_not_trim">Csak mp4 fájlok vághatóak</string>
<string name="pref_video_quality_entry_hfr">WVGA magas képkockasebesség</string>
+ <string name="pref_camera_scenemode_entry_antimotionblur">Elmosódás csökkentés</string>
+ <string name="pref_camera_scenemode_entry_aqua">Víz</string>
+ <string name="pref_camera_scenemode_entry_ar">Kiterjesztett valóság</string>
+ <string name="pref_camera_scenemode_entry_asd">Legjobb kép</string>
+ <string name="pref_camera_scenemode_entry_baby">Gyermek</string>
+ <string name="pref_camera_scenemode_entry_backgroundblur">Háttér életlenítése</string>
+ <string name="pref_camera_scenemode_entry_backlight">Háttérvilágítás</string>
+ <string name="pref_camera_scenemode_entry_backlightportrait">Háttérvilágítású portré</string>
+ <string name="pref_camera_scenemode_entry_barcode">Vonalkód</string>
+ <string name="pref_camera_scenemode_entry_beach">Strand</string>
+ <string name="pref_camera_scenemode_entry_beauty">Szépség</string>
+ <string name="pref_camera_scenemode_entry_candlelight">Gyertyafény</string>
+ <string name="pref_camera_scenemode_entry_cine">Mozi</string>
+ <string name="pref_camera_scenemode_entry_closeup">Közeli</string>
+ <string name="pref_camera_scenemode_entry_dark">Sötét</string>
+ <string name="pref_camera_scenemode_entry_dish">Elmosás</string>
+ <string name="pref_camera_scenemode_entry_duskdawn">Alkonyat</string>
+ <string name="pref_camera_scenemode_entry_document">Dokumentum</string>
+ <string name="pref_camera_scenemode_entry_fallcolor">Őszi színek</string>
+ <string name="pref_camera_scenemode_entry_fireworks">Tűzijáték</string>
+ <string name="pref_camera_scenemode_entry_flowers">Virágok</string>
+ <string name="pref_camera_scenemode_entry_handheldtwilight">Kézi szürkület</string>
+ <string name="pref_camera_scenemode_entry_highsensitivity">Nagy érzékenység</string>
+ <string name="pref_camera_scenemode_entry_indoor">Beltéri</string>
+ <string name="pref_camera_scenemode_entry_landscape">Tájkép</string>
+ <string name="pref_camera_scenemode_entry_mix_illuminant">Kevert fények</string>
+ <string name="pref_camera_scenemode_entry_mood">Hangulat</string>
+ <string name="pref_camera_scenemode_entry_nightportrait">Éjszakai portré</string>
+ <string name="pref_camera_scenemode_entry_nightindoor">Éjszakai beltéri</string>
+ <string name="pref_camera_scenemode_entry_oldfilm">Régi film</string>
+ <string name="pref_camera_scenemode_entry_pet">Háziállat</string>
+ <string name="pref_camera_scenemode_entry_portrait">Portré</string>
+ <string name="pref_camera_scenemode_entry_snow">Hó</string>
+ <string name="pref_camera_scenemode_entry_softskin">Bőr lágyítás</string>
+ <string name="pref_camera_scenemode_entry_sports">Sport esemény</string>
+ <string name="pref_camera_scenemode_entry_spotlight">Reflektorfény</string>
+ <string name="pref_camera_scenemode_entry_steadyphoto">Állókép</string>
+ <string name="pref_camera_scenemode_entry_supernight">Sötét éjszakai</string>
+ <string name="pref_camera_scenemode_entry_sweepstitch">Kötött hatású</string>
+ <string name="pref_camera_scenemode_entry_text">Szöveg</string>
+ <string name="pref_camera_scenemode_entry_theatre">Színház</string>
+ <string name="pref_camera_scenemode_entry_whiteboard">Fehértábla</string>
+ <string name="pref_camera_focusmode_entry_continuouspicture">Folyamatos fókusz</string>
+ <string name="pref_camera_focusmode_entry_extended">Kiterjesztett</string>
+ <string name="pref_camera_focusmode_entry_facedetect">Arcfelismerés</string>
+ <string name="pref_camera_focusmode_entry_facepriority">Arc prioritásos</string>
+ <string name="pref_camera_focusmode_entry_fixed">Rögzített</string>
+ <string name="pref_camera_focusmode_entry_portrait">Portré</string>
+ <string name="pref_camera_focusmode_entry_hyperfocal">Hiperfokális</string>
+ <string name="pref_camera_power_shutter_title">Exponálás bekapcsológombbal</string>
+ <string name="pref_camera_iso_entry_auto">Automatikus</string>
+ <string name="pref_camera_iso_entry_isodeblur">Kézremegés csökkentés</string>
+ <string name="pref_camera_iso_entry_isosports">Sportesemény</string>
+ <string name="pref_camera_iso_entry_isonight">Éjszakai</string>
+ <string name="pref_camera_iso_entry_isomovie">Mozi</string>
+ <string name="pref_camera_jpeg_title">JPEG minőség</string>
+ <string name="pref_video_jpeg_title">Kódolás minősége</string>
+ <string name="pref_camera_jpeg_entry_super">Kiváló</string>
+ <string name="pref_camera_jpeg_entry_high">Jó</string>
+ <string name="pref_camera_jpeg_entry_medium">Normál</string>
+ <string name="pref_camera_jpeg_entry_low">Gyenge</string>
+ <string name="pref_camera_coloreffect_title">Szín effektek</string>
+ <string name="pref_camera_coloreffect_entry_none">Nincs</string>
+ <string name="pref_camera_coloreffect_entry_mono">Fekete-fehér</string>
+ <string name="pref_camera_coloreffect_entry_sepia">Szépia</string>
+ <string name="pref_camera_coloreffect_entry_negative">Negatív</string>
+ <string name="pref_camera_coloreffect_entry_solarize">Szolarizált</string>
+ <string name="pref_camera_coloreffect_entry_posterize">Poszterizált</string>
+ <string name="pref_camera_coloreffect_entry_aqua">Víz</string>
+ <string name="pref_camera_coloreffect_entry_emboss">Dombormű</string>
+ <string name="pref_camera_coloreffect_entry_sketch">Vázlat</string>
+ <string name="pref_camera_coloreffect_entry_neon">Neon</string>
+ <string name="pref_camera_coloreffect_entry_pastel">Pasztell</string>
+ <string name="pref_camera_coloreffect_entry_mosaic">Mozaik</string>
+ <string name="pref_camera_coloreffect_entry_redtint">Vörös árnyalat</string>
+ <string name="pref_camera_coloreffect_entry_bluetint">Kék árnyalat</string>
+ <string name="pref_camera_coloreffect_entry_greentint">Zöld árnyalat</string>
+ <string name="pref_camera_coloreffect_entry_washed">Elmosódott</string>
+ <string name="pref_camera_coloreffect_entry_vintage_warm">Retro meleg</string>
+ <string name="pref_camera_coloreffect_entry_vintage_cold">Retro hideg</string>
+ <string name="pref_camera_coloreffect_entry_point_blue">Kékes</string>
+ <string name="pref_camera_coloreffect_entry_point_green">Zöldes</string>
+ <string name="pref_camera_coloreffect_entry_point_red_yellow">Pirosas-sárgás</string>
+ <string name="pref_camera_coloreffect_entry_cartoonize">Rajzfilm</string>
+ <string name="pref_camera_burst_title">Sorozatfelvétel</string>
+ <string name="pref_camera_burst_entry_off">Ki</string>
+ <string name="pref_camera_burst_entry_5">5 kép</string>
+ <string name="pref_camera_burst_entry_10">10 kép</string>
+ <string name="pref_camera_burst_entry_15">15 kép</string>
+ <string name="pref_camera_burst_entry_20">20 kép</string>
+ <string name="pref_camera_focustime_title">Fókusz tartás</string>
+ <string name="pref_camera_focustime_summary">Válassza ki a fókusz tartás idejét</string>
+ <string name="pref_camera_focustime_entry_5">5 mp</string>
+ <string name="pref_camera_focustime_entry_10">10 mp</string>
+ <string name="pref_camera_focustime_entry_15">15 mp</string>
+ <string name="pref_camera_focustime_entry_20">20 mp</string>
+ <string name="pref_camera_focustime_entry_30">30 mp</string>
+ <string name="pref_camera_focustime_entry_infinite">Végtelen</string>
+ <string name="pref_camera_flashmode_entry_redeye">Vörösszem</string>
+ <string name="pref_camera_flashmode_label_redeye">VÖRÖSSZEM</string>
</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 33325cf8b..5898ce81a 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -38,6 +38,104 @@
<string name="pref_camera_picturesize_entry_svga">SVGA</string>
<string name="pref_camera_picturesize_entry_wvga">WVGA</string>
<string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
+ <string name="pref_camera_focusmode_entry_continuouspicture">Scatti continui</string>
+ <string name="pref_camera_focusmode_entry_extended">Esteso</string>
+ <string name="pref_camera_focusmode_entry_facedetect">Rilevamento viso</string>
+ <string name="pref_camera_focusmode_entry_facepriority">Priorità viso</string>
+ <string name="pref_camera_focusmode_entry_fixed">Fisso</string>
+ <string name="pref_camera_focusmode_entry_hyperfocal">Iperfocale</string>
+ <string name="pref_camera_focusmode_entry_portrait">Ritratto</string>
+ <string name="pref_camera_scenemode_entry_antimotionblur">Riduzione sfocatura da movimento</string>
+ <string name="pref_camera_scenemode_entry_aqua">Acqua</string>
+ <string name="pref_camera_scenemode_entry_ar">Realtà aumentata</string>
+ <string name="pref_camera_scenemode_entry_asd">Scatto migliore</string>
+ <string name="pref_camera_scenemode_entry_baby">Bimbo</string>
+ <string name="pref_camera_scenemode_entry_backgroundblur">Fondale sfocato</string>
+ <string name="pref_camera_scenemode_entry_backlightportrait">Ritratto retroilluminato</string>
+ <string name="pref_camera_scenemode_entry_backlight">Retroilluminato</string>
+ <string name="pref_camera_scenemode_entry_barcode">Codice a barre</string>
+ <string name="pref_camera_scenemode_entry_beach">Spiaggia</string>
+ <string name="pref_camera_scenemode_entry_beauty">Bellezza</string>
+ <string name="pref_camera_scenemode_entry_candlelight">Lume di candela</string>
+ <string name="pref_camera_scenemode_entry_cine">Cinema</string>
+ <string name="pref_camera_scenemode_entry_closeup">Ravvicinato</string>
+ <string name="pref_camera_scenemode_entry_dark">Scuro</string>
+ <string name="pref_camera_scenemode_entry_dish">Piatto</string>
+ <string name="pref_camera_scenemode_entry_document">Documento</string>
+ <string name="pref_camera_scenemode_entry_duskdawn">Alba/Tramonto</string>
+ <string name="pref_camera_scenemode_entry_fallcolor">Colori di primavera</string>
+ <string name="pref_camera_scenemode_entry_fireworks">Fuochi d\'artificio</string>
+ <string name="pref_camera_scenemode_entry_flowers">Fiori</string>
+ <string name="pref_camera_scenemode_entry_handheldtwilight">Crepuscolo, a mano</string>
+ <string name="pref_camera_scenemode_entry_highsensitivity">Alta sensibilità</string>
+ <string name="pref_camera_scenemode_entry_indoor">Interno</string>
+ <string name="pref_camera_scenemode_entry_landscape">Panorama</string>
+ <string name="pref_camera_scenemode_entry_mix_illuminant">Illuminazione mista</string>
+ <string name="pref_camera_scenemode_entry_mood">Umore</string>
+ <string name="pref_camera_scenemode_entry_nightindoor">Interno di notte</string>
+ <string name="pref_camera_scenemode_entry_nightportrait">Ritratto notturno</string>
+ <string name="pref_camera_scenemode_entry_oldfilm">Vecchio film</string>
+ <string name="pref_camera_scenemode_entry_pet">Cucciolo</string>
+ <string name="pref_camera_scenemode_entry_portrait">Ritratto</string>
+ <string name="pref_camera_scenemode_entry_snow">Neve</string>
+ <string name="pref_camera_scenemode_entry_softskin">Pelle soffice</string>
+ <string name="pref_camera_scenemode_entry_sports">Sport</string>
+ <string name="pref_camera_scenemode_entry_spotlight">Spotlight</string>
+ <string name="pref_camera_scenemode_entry_steadyphoto">Treppiede</string>
+ <string name="pref_camera_scenemode_entry_supernight">Notte nera</string>
+ <string name="pref_camera_scenemode_entry_sweepstitch">Panorama, multifoto</string>
+ <string name="pref_camera_scenemode_entry_text">Testo</string>
+ <string name="pref_camera_scenemode_entry_theatre">Teatro</string>
+ <string name="pref_camera_scenemode_entry_whiteboard">Lavagna bianca</string>
+ <string name="pref_camera_power_shutter_title">Scatta tasto On/Off</string>
+ <string name="pref_camera_iso_entry_auto">Automatico</string>
+ <string name="pref_camera_iso_entry_isodeblur">Automatico (HJR)</string>
+ <string name="pref_camera_iso_entry_isosports">Sport</string>
+ <string name="pref_camera_iso_entry_isonight">Notte</string>
+ <string name="pref_camera_iso_entry_isomovie">Film</string>
+ <string name="pref_camera_jpeg_title">Qualità JPEG</string>
+ <string name="pref_video_jpeg_title">Qualità codifica video</string>
+ <string name="pref_camera_jpeg_entry_super">Eccellente</string>
+ <string name="pref_camera_jpeg_entry_high">Alta</string>
+ <string name="pref_camera_jpeg_entry_medium">Media</string>
+ <string name="pref_camera_jpeg_entry_low">Bassa</string>
+ <string name="pref_camera_coloreffect_title">Effetti colore</string>
+ <string name="pref_camera_coloreffect_entry_none">Nessuno</string>
+ <string name="pref_camera_coloreffect_entry_mono">Bianco e nero</string>
+ <string name="pref_camera_coloreffect_entry_sepia">Seppia</string>
+ <string name="pref_camera_coloreffect_entry_negative">Negativo</string>
+ <string name="pref_camera_coloreffect_entry_solarize">Solarizzato</string>
+ <string name="pref_camera_coloreffect_entry_posterize">Posterizzazione</string>
+ <string name="pref_camera_coloreffect_entry_aqua">Acqua</string>
+ <string name="pref_camera_coloreffect_entry_emboss">Rilievo</string>
+ <string name="pref_camera_coloreffect_entry_sketch">Schizzo</string>
+ <string name="pref_camera_coloreffect_entry_neon">Neon</string>
+ <string name="pref_camera_coloreffect_entry_pastel">Pastello</string>
+ <string name="pref_camera_coloreffect_entry_mosaic">Mosaico</string>
+ <string name="pref_camera_coloreffect_entry_redtint">Tinta rossa</string>
+ <string name="pref_camera_coloreffect_entry_bluetint">Tinta blu</string>
+ <string name="pref_camera_coloreffect_entry_greentint">Tinta verde</string>
+ <string name="pref_camera_coloreffect_entry_washed">Lavato</string>
+ <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage caldo</string>
+ <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage freddo</string>
+ <string name="pref_camera_coloreffect_entry_point_blue">Punto blu</string>
+ <string name="pref_camera_coloreffect_entry_point_green">Punto verde</string>
+ <string name="pref_camera_coloreffect_entry_point_red_yellow">Punto rosso-giallo</string>
+ <string name="pref_camera_coloreffect_entry_cartoonize">Cartone animato</string>
+ <string name="pref_camera_burst_title">Scatti continui</string>
+ <string name="pref_camera_burst_entry_off">Off</string>
+ <string name="pref_camera_burst_entry_5">5 scatti</string>
+ <string name="pref_camera_burst_entry_10">10 scatti</string>
+ <string name="pref_camera_burst_entry_15">15 scatti</string>
+ <string name="pref_camera_burst_entry_20">20 scatti</string>
+ <string name="pref_camera_focustime_title">Fuoco: durata tocco</string>
+ <string name="pref_camera_focustime_summary">Seleziona la durata per il tocco della messa a fuoco</string>
+ <string name="pref_camera_focustime_entry_5">5s</string>
+ <string name="pref_camera_focustime_entry_10">10s</string>
+ <string name="pref_camera_focustime_entry_15">15s</string>
+ <string name="pref_camera_focustime_entry_20">20s</string>
+ <string name="pref_camera_focustime_entry_30">30s</string>
+ <string name="pref_camera_focustime_entry_infinite">Infinito</string>
<string name="bass_boost_strength">Bass boost</string>
<string name="virtualizer_strength">Effetto 3D</string>
<string name="audio_effects">Effetti audio</string>
@@ -45,4 +143,6 @@
<string name="fail_trim">Questo file video non può essere tagliato</string>
<string name="can_not_trim">Solo i file mp4 possono essere tagliati</string>
<string name="pref_video_quality_entry_hfr">WVGA frame rate elevato</string>
+ <string name="pref_camera_flashmode_entry_redeye">Occhi rossi</string>
+ <string name="pref_camera_flashmode_label_redeye">OCCHI ROSSI</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0098cebb2..5765dad51 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -56,7 +56,7 @@
<color name="time_lapse_arc">#FFC5C5C5</color>
<color name="indicator_background">#40000000</color>
<color name="popup_title_color">#ff33b5e5</color>
- <color name="popup_background">#ff282828</color>
+ <color name="popup_background">#60282828</color>
<color name="pano_progress_empty">#FF2E2E2E</color>
<color name="pano_progress_done">#FF33525E</color>
<color name="pano_progress_indication">#FF0099CC</color>
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 3a5a478db..0bfc075cb 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -135,6 +135,7 @@ public class PhotoMenu extends PieController
timerPopup.setSettingChangedListener(PhotoMenu.this);
mUI.dismissPopup();
mPopup = timerPopup;
+ mPopupStatus = POPUP_SECOND_LEVEL;
mUI.showPopup(mPopup);
}
});
@@ -161,27 +162,6 @@ public class PhotoMenu extends PieController
});
more.addItem(item);
}
- // Storage location
- if (group.findPreference(CameraSettings.KEY_STORAGE) != null) {
- item = makeItem(R.drawable.stat_notify_sdcard);
- final ListPreference storagePref = group.findPreference(CameraSettings.KEY_STORAGE);
- item.setLabel(res.getString(R.string.pref_camera_storage_title).toUpperCase(locale));
- item.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(PieItem item) {
- LayoutInflater inflater = mActivity.getLayoutInflater();
- ListPrefSettingPopup popup = (ListPrefSettingPopup) inflater.inflate(
- R.layout.list_pref_setting_popup, null, false);
- popup.initialize(storagePref);
- popup.setSettingChangedListener(PhotoMenu.this);
- mUI.dismissPopup();
- mPopup = popup;
- mPopupStatus = POPUP_SECOND_LEVEL;
- mUI.showPopup(mPopup);
- }
- });
- more.addItem(item);
- }
// white balance
if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) {
item = makeItem(CameraSettings.KEY_WHITE_BALANCE);
@@ -211,6 +191,7 @@ public class PhotoMenu extends PieController
}
// extra settings popup
mOtherKeys = new String[] {
+ CameraSettings.KEY_STORAGE,
CameraSettings.KEY_FOCUS_MODE,
CameraSettings.KEY_FOCUS_TIME,
CameraSettings.KEY_POWER_SHUTTER,
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index e3874dd30..d40586969 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -850,6 +850,7 @@ public class PhotoModule
// Finish capture animation
mHandler.removeMessages(CAPTURE_ANIMATION_DONE);
((CameraScreenNail) mActivity.mCameraScreenNail).animateSlide();
+ mUI.enablePreviewThumb(true);
mHandler.sendEmptyMessageDelayed(CAPTURE_ANIMATION_DONE,
CaptureAnimManager.getAnimationDuration());
}
@@ -1063,9 +1064,6 @@ public class PhotoModule
&& mActivity.mShowCameraAppView) {
// Start capture animation.
((CameraScreenNail) mActivity.mCameraScreenNail).animateFlash(mDisplayRotation);
- mUI.enablePreviewThumb(true);
- mHandler.sendEmptyMessageDelayed(CAPTURE_ANIMATION_DONE,
- CaptureAnimManager.getAnimationDuration());
}
}
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 42907274b..bf804e3f7 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -103,12 +103,12 @@ public class PhotoUI implements PieListener,
int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
int width = right - left;
int height = bottom - top;
- // Full-screen screennail
- int w = width;
- int h = height;
+ // Get screennail size from mPreviewFrameLayout
+ int w = mPreviewFrameLayout.getWidth();
+ int h = mPreviewFrameLayout.getHeight();
if (Util.getDisplayRotation(mActivity) % 180 != 0) {
- w = height;
- h = width;
+ w = mPreviewFrameLayout.getHeight();
+ h = mPreviewFrameLayout.getWidth();
}
if (mPreviewWidth != width || mPreviewHeight != height) {
mPreviewWidth = width;
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 99cad8743..b9774d2a6 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -105,12 +105,12 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener,
int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
int width = right - left;
int height = bottom - top;
- // Full-screen screennail
- int w = width;
- int h = height;
+ // Get screennail size from mPreviewFrameLayout
+ int w = mPreviewFrameLayout.getWidth();
+ int h = mPreviewFrameLayout.getHeight();
if (Util.getDisplayRotation(mActivity) % 180 != 0) {
- w = height;
- h = width;
+ w = mPreviewFrameLayout.getHeight();
+ h = mPreviewFrameLayout.getWidth();
}
if (mPreviewWidth != width || mPreviewHeight != height) {
mPreviewWidth = width;
diff --git a/src/com/android/camera/ui/CameraRootView.java b/src/com/android/camera/ui/CameraRootView.java
index 76fea2cfa..aee5c2fa4 100644
--- a/src/com/android/camera/ui/CameraRootView.java
+++ b/src/com/android/camera/ui/CameraRootView.java
@@ -94,9 +94,15 @@ public class CameraRootView extends RelativeLayout {
if (mCurrentInsets.right > 0) {
// navigation bar on the right
mRightMargin = mRightMargin > 0 ? mRightMargin : mCurrentInsets.right;
+ if (mBottomMargin > 0) {
+ mBottomMargin -= mOffset;
+ }
} else {
// navigation bar on the bottom
mBottomMargin = mBottomMargin > 0 ? mBottomMargin : mCurrentInsets.bottom;
+ if (mRightMargin > 0) {
+ mRightMargin -= mOffset;
+ }
}
}
// make sure all the children are resized
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 07:17:54 +0000