From 454c6838bb220142d05fbd6f1858ba31cc034eda Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Mon, 30 Aug 2010 13:51:39 -0700 Subject: Remove metering mode support. Change-Id: I624f611e19c438630bc84778332d13f0357da23f --- res/values-cs/strings.xml | 4 ---- res/values-da/strings.xml | 4 ---- res/values-de/strings.xml | 4 ---- res/values-el/strings.xml | 4 ---- res/values-es-rUS/strings.xml | 4 ---- res/values-es/strings.xml | 4 ---- res/values-fr/strings.xml | 4 ---- res/values-it/strings.xml | 4 ---- res/values-ja/strings.xml | 4 ---- res/values-ko/strings.xml | 4 ---- res/values-nb/strings.xml | 4 ---- res/values-nl/strings.xml | 4 ---- res/values-pl/strings.xml | 4 ---- res/values-pt-rPT/strings.xml | 4 ---- res/values-pt/strings.xml | 4 ---- res/values-ru/strings.xml | 4 ---- res/values-sv/strings.xml | 4 ---- res/values-tr/strings.xml | 4 ---- res/values-zh-rCN/strings.xml | 4 ---- res/values-zh-rTW/strings.xml | 4 ---- res/values/arrays.xml | 13 ------------- res/values/strings.xml | 11 ----------- res/xml/camera_preferences.xml | 6 ------ 23 files changed, 110 deletions(-) (limited to 'res') diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index cd9e294..9323351 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -107,10 +107,6 @@ "Nastavení fotoaparátu" "Obnovit výchozí nastavení" "Expozice" - "Režim měření" - "Vážený střed" - "Průměr snímku" - "Bod" "OK" "Na vaší kartě SD je málo místa. Změňte nastavení kvality nebo smažte položky z Galerie." "Bylo dosaženo limitu velikosti." diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 956efa1..fe29540 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -107,10 +107,6 @@ "Indstillinger for kamera" "Gendan til standarder" "Eksponering" - "Måletilstand" - "Centervægtet" - "Billedgennemsnit" - "Spot" "OK" "Der er snart ikke mere plads på diit SD-kort. Rediger indstillingerne for kvaliteten, eller slet elementer fra Galleriet." "Størrelsesgrænse er nået." diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 4d5ab1f..19c3531 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -107,10 +107,6 @@ "Kameraeinstellungen" "Standard wiederherstellen" "Belichtung" - "Belichtungsmessung" - "Mittenbetont" - "Durchschnittliche Frames" - "Spot" "OK" "Auf Ihrer SD-Karte ist nicht mehr genügend Speicherplatz vorhanden. Ändern Sie die Qualitätseinstellung oder löschen Sie Elemente aus der Galerie." "Maximale Größe erreicht" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 0f10fe7..bdb816d 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -107,10 +107,6 @@ "Ρυθμίσεις φωτογραφικής μηχανής" "Επαναφορά στις προεπιλογές" "Έκθεση" - "Τρόπος φωτομέτρησης" - "Κεντροσταθμισμένη" - "Μέσος όρος καρέ" - "Σημείο" "OK" "Ο διαθέσιμος χώρος στην κάρτα SD είναι ελάχιστος. Αλλάξτε τη ρύθμιση ποιότητας ή διαγράψτε στοιχεία από τη συλλογή." "Συμπληρώθηκε το όριο μεγέθους." diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 3fcdc86..d5f7051 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -107,10 +107,6 @@ "Configuración de cámara" "Restaurar a configuraciones predeterminadas" "Exposición" - "Modo de medición" - "Ponderada al centro" - "Marco promedio" - "Punto" "Aceptar" "Tu tarjeta SD se está quedando sin espacio. Cambia la configuración de calidad o elimina elementos de la galería." "Se alcanzó el límite del tamaño." diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index bb27ba7..0118035 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -107,10 +107,6 @@ "Configuración de cámara" "Restaurar a los valores predeterminados" "Exposición" - "Modo de medición" - "Ponderada al centro" - "Media de marco" - "Punto" "Aceptar" "No queda espacio en la tarjeta SD. Cambia la configuración de calidad o elimina elementos de la galería." "Se ha alcanzado el límite de tamaño." diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 7af3000..f265c3b 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -107,10 +107,6 @@ "Paramètres de l\'appareil photo" "Rétablir les paramètres par défaut" "Exposition" - "Mode de mesure" - "Pondérée centrale" - "Moyenne" - "Spot" "OK" "Votre carte SD est pleine. Modifiez le paramètre de qualité ou supprimez des éléments de la galerie." "Taille maximale atteinte." diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index d3d94cf..736aec5 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -107,10 +107,6 @@ "Impostazioni fotocamera" "Ripristina predefinite" "Esposizione" - "Modalità di misurazione" - "Ponderata al centro" - "Media" - "Spot" "OK" "Lo spazio della scheda SD si sta esaurendo. Cambia l\'impostazione di qualità o elimina elementi nella galleria." "Limite di dimensione raggiunto." diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index a6e941c..66ea853 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -107,10 +107,6 @@ "カメラ設定" "初期設定に戻す" "露出" - "測光モード" - "中央重点測光" - "多分割測光" - "スポット測光" "OK" "SDカードの容量が足りません。クオリティ設定を変更するか、ギャラリーからアイテムを削除してください。" "サイズ制限に達しました。" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index a12e169..a9d03b6 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -107,10 +107,6 @@ "카메라 설정" "기본값으로 복원" "노출" - "측광 방식" - "중앙부 중점 측광" - "프레임 평균" - "스팟" "확인" "SD 카드의 공간이 부족합니다. 화질 설정을 변경하거나 갤러리에서 항목을 삭제하세요." "크기 한도에 도달했습니다." diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 38a4136..8194709 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -107,10 +107,6 @@ "Kamerainnstillinger" "Gjenopprett til standardinnstillingene" "Eksponering" - "Målemodus" - "Sentervektet" - "Gjennomsnittlig ramme" - "Punkt" "OK" "Minnekortet begynner å gå tom for plass. Endre kvalitetsinnstillingen eller slett bilder fra galleriet." "Videoen ble for stor." diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 05a0197..d403b2a 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -107,10 +107,6 @@ "Camera-instellingen" "Terugzetten naar standaardwaarden" "Belichting" - "Metermodus" - "Middelpunt gewogen" - "Framegemiddelde" - "Punt" "OK" "Er is weinig ruimte beschikbaar op uw SD-kaart. U kunt de kwaliteitsinstelling wijzigen of items uit de galerij verwijderen." "Maximale grootte bereikt" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index b7b7e59..0361af8 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -107,10 +107,6 @@ "Ustawienia aparatu" "Przywróć wartości domyślne" "Ekspozycja" - "Metoda pomiaru" - "Centralnie ważony" - "Uśredniony z kadru" - "Punktowy" "OK" "Na karcie SD brakuje miejsca. Zmień ustawienie jakości lub usuń elementy z Galerii." "Osiągnięto limit rozmiaru." diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 9531c30..c3074e0 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -107,10 +107,6 @@ "Definições da câmara" "Restaurar para valores predefinidos" "Exposição" - "Modo de medição" - "Central ponderada" - "Média de fotogramas" - "Ponto" "OK" "Está a ficar sem espaço no cartão SD. Altere as definições de qualidade ou elimine itens da Galeria." "Limite de tamanho atingido." diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index f7a7e0f..eea0d90 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -107,10 +107,6 @@ "Configurações da câmera" "Restaurar para os valores padrão" "Exposição" - "Modo de medição" - "Centralizar" - "Média de frames" - "Ponto" "OK" "O seu cartão SD está sem espaço. Mude a configuração de qualidade ou exclua itens da Galeria." "Limite de tamanho atingido." diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index f2185ab..8a02a6f 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -107,10 +107,6 @@ "Настройки камеры" "Заводские настройки" "Экспозиция" - "Режим измерения" - "Центровзвешенный" - "Усредненный" - "Точечный" "ОК" "Место на вашей SD-карте заканчивается. Измените настройки качества или удалите содержимое из галереи." "Достигнут предельный размер видео." diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index e72b72f..8eb708f 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -107,10 +107,6 @@ "Kamerainställningar" "Återställ standardvärden" "Exponering" - "Mätläge" - "Centrerad" - "Bildrutemedel" - "Punkt" "OK" "Ditt SD-kort börjar bli fullt. Ändra inställningen för kvalitet eller ta bort objekt från Galleri." "Storleksgränsen nådd." diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 1b5e45b..e3649ff 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -107,10 +107,6 @@ "Kamera ayarları" "Varsayılan değerleri geri yükle" "Pozlama" - "Ölçme modu" - "Merkez Ağırlıklı" - "Çerçeve Ortalaması" - "Nokta" "Tamam" "SD kartınızda boş alan azalıyor. Kalite ayarlarını değiştirin veya Galeri\'den öğe silin." "Boyut sınırına ulaşıldı." diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 1f7dafe..91f2c7c 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -107,10 +107,6 @@ "相机设置" "还原为默认设置" "曝光" - "测光模式" - "中央重点测光" - "面平均测光" - "点测光" "确定" "SD 卡空间已快用完。请更改画质设置或删除图库中的部分内容。" "已达到大小上限。" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 31f9139..daa5463 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -107,10 +107,6 @@ "相機設定" "還原成預設值" "曝光" - "測光模式" - "中央權重" - "畫面均化" - "點" "確定" "您的 SD 卡空間已快用完。請變更品質設定或刪除圖庫中的項目。" "已達大小上限。" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 473fb47..2299935 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -261,18 +261,5 @@ off on - - - - - @string/pref_camera_meteringmode_entry_center_weighted - @string/pref_camera_meteringmode_entry_spot - @string/pref_camera_meteringmode_entry_frame_average - - - - center-weighted - frame-average - spot diff --git a/res/values/strings.xml b/res/values/strings.xml index b908456..e1e37d9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -265,17 +265,6 @@ Exposure 0 - - center-weighted - - - Metering mode - - - Center Weighted - Frame Average - Spot - diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 96eff91..c70c253 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -81,11 +81,5 @@ camera:title="@string/pref_camera_quickcapture_title" camera:entries="@array/pref_camera_quickcapture_entries" camera:entryValues="@array/pref_camera_quickcapture_entryvalues" /> - -- cgit v1.1