From de365d87520c97d6b1636442e6b5c82a3e036f29 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Wed, 18 Mar 2009 17:39:48 -0700 Subject: auto import from //branches/cupcake_rel/...@140373 --- res/drawable/frame_thumbnail_default.png | Bin 1316 -> 4830 bytes res/drawable/frame_thumbnail_pressed.png | Bin 1380 -> 2289 bytes res/drawable/frame_thumbnail_selected.png | Bin 1397 -> 5039 bytes res/drawable/ic_btn_camera_default_background.png | Bin 1229 -> 2158 bytes res/drawable/ic_btn_camera_pressed_background.png | Bin 1310 -> 2289 bytes res/drawable/ic_btn_camera_selected_background.png | Bin 1394 -> 5039 bytes res/layout/camera.xml | 2 +- res/layout/video_camera.xml | 16 +++++++++++++--- res/layout/viewimage.xml | 4 ++-- res/values-cs/arrays.xml | 4 ++-- res/values-cs/strings.xml | 5 ++++- res/values-de/arrays.xml | 4 ++-- res/values-de/strings.xml | 4 +++- res/values-es/arrays.xml | 4 ++-- res/values-es/strings.xml | 5 ++++- res/values-fr/arrays.xml | 4 ++-- res/values-fr/strings.xml | 5 ++++- res/values-it/arrays.xml | 4 ++-- res/values-it/strings.xml | 5 ++++- res/values-ja/arrays.xml | 4 ++-- res/values-ja/strings.xml | 5 ++++- res/values-ko/arrays.xml | 4 ++-- res/values-ko/strings.xml | 5 ++++- res/values-nb/strings.xml | 6 ++++-- res/values-nl/arrays.xml | 4 ++-- res/values-nl/strings.xml | 5 ++++- res/values-pl/arrays.xml | 4 ++-- res/values-pl/strings.xml | 5 ++++- res/values-ru/arrays.xml | 4 ++-- res/values-ru/strings.xml | 5 ++++- res/values-zh-rCN/arrays.xml | 4 ++-- res/values-zh-rCN/strings.xml | 5 ++++- res/values-zh-rTW/arrays.xml | 4 ++-- res/values-zh-rTW/strings.xml | 5 ++++- res/values/strings.xml | 4 ++-- 35 files changed, 93 insertions(+), 46 deletions(-) (limited to 'res') diff --git a/res/drawable/frame_thumbnail_default.png b/res/drawable/frame_thumbnail_default.png index 3db932e..a7498db 100644 Binary files a/res/drawable/frame_thumbnail_default.png and b/res/drawable/frame_thumbnail_default.png differ diff --git a/res/drawable/frame_thumbnail_pressed.png b/res/drawable/frame_thumbnail_pressed.png index b15aea7..ebc6855 100644 Binary files a/res/drawable/frame_thumbnail_pressed.png and b/res/drawable/frame_thumbnail_pressed.png differ diff --git a/res/drawable/frame_thumbnail_selected.png b/res/drawable/frame_thumbnail_selected.png index 408b14a..429a318 100644 Binary files a/res/drawable/frame_thumbnail_selected.png and b/res/drawable/frame_thumbnail_selected.png differ diff --git a/res/drawable/ic_btn_camera_default_background.png b/res/drawable/ic_btn_camera_default_background.png index c37a86e..5dac9c1 100644 Binary files a/res/drawable/ic_btn_camera_default_background.png and b/res/drawable/ic_btn_camera_default_background.png differ diff --git a/res/drawable/ic_btn_camera_pressed_background.png b/res/drawable/ic_btn_camera_pressed_background.png index 8707b8a..ebc6855 100644 Binary files a/res/drawable/ic_btn_camera_pressed_background.png and b/res/drawable/ic_btn_camera_pressed_background.png differ diff --git a/res/drawable/ic_btn_camera_selected_background.png b/res/drawable/ic_btn_camera_selected_background.png index a6bbdb1..429a318 100644 Binary files a/res/drawable/ic_btn_camera_selected_background.png and b/res/drawable/ic_btn_camera_selected_background.png differ diff --git a/res/layout/camera.xml b/res/layout/camera.xml index c326c04..02d8430 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -36,7 +36,7 @@ android:focusable="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginRight="50dip" + android:layout_marginRight="10dip" android:layout_marginTop="10dip" android:scaleType="center" /> diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml index f1c746b..bafcd09 100644 --- a/res/layout/video_camera.xml +++ b/res/layout/video_camera.xml @@ -50,7 +50,7 @@ android:focusable="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginRight="50dip" + android:layout_marginRight="10dip" android:layout_marginTop="10dip" android:scaleType="center"/> @@ -81,7 +81,7 @@ android:id="@+id/post_picture_panel" android:layout_alignTop="@id/shutter_button" android:layout_toLeftOf="@id/shutter_button" - android:layout_marginRight="15dip" + android:layout_marginRight="38dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal"> @@ -123,5 +123,15 @@ style="@style/OnscreenActionIcon" /> + - diff --git a/res/layout/viewimage.xml b/res/layout/viewimage.xml index 99d76b0..b0d2034 100644 --- a/res/layout/viewimage.xml +++ b/res/layout/viewimage.xml @@ -87,7 +87,7 @@ android:focusable="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginRight="50dip" + android:layout_marginRight="10dip" android:layout_marginTop="10dip" android:scaleType="center"/> @@ -96,7 +96,7 @@ android:id="@+id/action_icon_panel" android:layout_alignBottom="@id/shutter_button" android:layout_toLeftOf="@id/shutter_button" - android:layout_marginRight="15dip" + android:layout_marginRight="38dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal"> diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-cs/arrays.xml +++ b/res/values-cs/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index b0e06c1..4a84d72 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -59,6 +59,8 @@ "Mazání..." "Tuto fotografii nelze sdílet." "Toto video nelze sdílet." + + "Galerie" "Fotografie" "Tapeta" @@ -147,9 +149,10 @@ "Pokračovat v přehrávání" "Začít znovu" "Rámeček fotografie" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-de/arrays.xml +++ b/res/values-de/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index c166287..5b6cae5 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -59,6 +59,7 @@ "Löschvorgang..." "Dieses Bild kann nicht weitergeleitet werden." "Dieses Video kann nicht weitergeleitet werden." + "Play" "Galerie" "Bilder" "Hintergrund" @@ -147,9 +148,10 @@ "Mit Wiedergabe fortfahren" "Starten" "Bildrahmen" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-es/arrays.xml +++ b/res/values-es/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 5225151..d000e7e 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -59,6 +59,8 @@ "Eliminando..." "Esta imagen no se puede compartir." "Este vídeo no se puede compartir." + + "Galería" "Imágenes" "Fondo de pantalla" @@ -147,9 +149,10 @@ "Reanudar reproducción" "Volver a reproducir" "Picture frame" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-fr/arrays.xml +++ b/res/values-fr/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index f0e6a1f..4908916 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -59,6 +59,8 @@ "Suppression..." "Impossible de partager cette image." "Cette vidéo ne peut pas être partagée." + + "Galerie" "Images" "Arrière-plan" @@ -147,9 +149,10 @@ "Reprendre la lecture" "Démarrer" "Cadre d\'image" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-it/arrays.xml +++ b/res/values-it/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 3db66bc..e92e78f 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -59,6 +59,8 @@ "Eliminazione..." "Impossibile condividere la foto." "Impossibile condividere il video." + + "Galleria" "Foto" "Sfondo" @@ -147,9 +149,10 @@ "Riprendi riproduzione" "Ricomincia" "Cornice immagine" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-ja/arrays.xml +++ b/res/values-ja/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index f5e5b1b..290cd6b 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -59,6 +59,8 @@ "削除中..." "この写真は共有できません。" "この動画は共有できません。" + + "ギャラリー" "写真" "壁紙" @@ -147,9 +149,10 @@ "再生を再開" "最初から再生" "写真フレーム" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-ko/arrays.xml +++ b/res/values-ko/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 304b544..0b653ac 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -59,6 +59,8 @@ "삭제 중..." "공유할 수 없는 사진입니다." "공유할 수 없는 동영상입니다." + + "갤러리" "사진" "배경화면" @@ -147,9 +149,10 @@ "재생 다시 시작" "시작" "사진 프레임" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index c268ecb..f15a058 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -59,6 +59,8 @@ "Sletter…" "Bildet kan ikke deles." "Videoen kan ikke deles." + + "Galleri" "Bilder" "Bakgrunnsbilder" @@ -147,10 +149,10 @@ "Fortsett avspilling" "Begynn på nytt" "Bilderamme" - - + + diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-nl/arrays.xml +++ b/res/values-nl/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index c02a861..5cc88eb 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -59,6 +59,8 @@ "Verwijderen..." "Deze foto kan niet worden gedeeld." "Deze video kan niet worden gedeeld." + + "Galerij" "Foto\'s" "Achtergrond" @@ -147,9 +149,10 @@ "Afspelen hervatten" "Opnieuw starten" "Fotolijstje" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-pl/arrays.xml +++ b/res/values-pl/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 7023e80..ec05944 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -59,6 +59,8 @@ "Trwa usuwanie…" "Nie można przesłać tego zdjęcia." "Nie można przesłać tego filmu." + + "Galeria" "Zdjęcia" "Tapeta" @@ -147,9 +149,10 @@ "Wznów odtwarzanie" "Rozpocznij" "Ramka zdjęcia" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-ru/arrays.xml +++ b/res/values-ru/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 34cbfd3..92d2f2e 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -59,6 +59,8 @@ "Идет удаление…" "Отправить это изображение нельзя." "Отправить это видео нельзя." + + "Галерея" "Изображения" "Фоновый рисунок" @@ -147,9 +149,10 @@ "Продолжить воспроизведение" "Начать с начала" "Рамка фотографии" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-zh-rCN/arrays.xml +++ b/res/values-zh-rCN/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index f89c694..e0161d9 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -59,6 +59,8 @@ "正在删除..." "无法共享此图片。" "无法共享此视频。" + + "图片库" "图片" "壁纸" @@ -147,9 +149,10 @@ "重新播放" "重新开始" "相框" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml index 0583b87..dfbf090 100644 --- a/res/values-zh-rTW/arrays.xml +++ b/res/values-zh-rTW/arrays.xml @@ -15,8 +15,8 @@ --> - - + + "0" "1" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index c311294..dceb5eb 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -59,6 +59,8 @@ "刪除中…" "此相片無法分享。" "此影片無法分享。" + + "圖庫" "相片" "桌布" @@ -147,9 +149,10 @@ "繼續播放" "重新開始" "相框" - "\'video\'-yyyy-MM-dd-HH-mm-ss" + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 0121bd1..cea087d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -151,7 +151,7 @@ This video cannot be shared. - + Play @@ -447,7 +447,7 @@ - "'video'-yyyy-MM-dd-HH-mm-ss" + "'video'-yyyy-MM-dd-HH-mm-ss" File info: -- cgit v1.1