From 3dd3e5540c4c9b9dff54fa20e62710c7b34e2db6 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Mon, 28 Oct 2024 13:03:08 +0530 Subject: [PATCH] Change album string to folders --- res/layout/choose_widget_type.xml | 2 +- res/menu/albumset.xml | 2 +- res/menu/navigation_items.xml | 2 +- res/values-de/e_strings.xml | 6 ++++++ res/values-es/e_strings.xml | 6 ++++++ res/values-fr/e_strings.xml | 6 ++++++ res/values-it/e_strings.xml | 6 ++++++ res/values/e_strings.xml | 6 ++++++ src/com/android/gallery3d/app/AlbumPicker.java | 2 +- src/com/android/gallery3d/app/AlbumSetPage.java | 6 +++--- src/com/android/gallery3d/app/GalleryActivity.java | 4 ++-- 11 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 res/values-de/e_strings.xml create mode 100644 res/values-es/e_strings.xml create mode 100644 res/values-fr/e_strings.xml create mode 100644 res/values-it/e_strings.xml create mode 100755 res/values/e_strings.xml diff --git a/res/layout/choose_widget_type.xml b/res/layout/choose_widget_type.xml index 772bc317b..60f2bf609 100644 --- a/res/layout/choose_widget_type.xml +++ b/res/layout/choose_widget_type.xml @@ -27,7 +27,7 @@ android:layout_weight="1" android:minHeight="48dp" android:textColor="@color/e_primary_text_color" - android:text="@string/widget_type_album"/> + android:text="@string/e_widget_type_album"/> diff --git a/res/menu/navigation_items.xml b/res/menu/navigation_items.xml index 8758d9b83..dd77632f0 100644 --- a/res/menu/navigation_items.xml +++ b/res/menu/navigation_items.xml @@ -6,7 +6,7 @@ + android:title="@string/e_albums_title" /> + + Ordner auswählen + Wählen Sie einen Ordner + Ordner + diff --git a/res/values-es/e_strings.xml b/res/values-es/e_strings.xml new file mode 100644 index 000000000..e40a3b04f --- /dev/null +++ b/res/values-es/e_strings.xml @@ -0,0 +1,6 @@ + + + Seleccionar carpeta + Elegir una carpeta + Carpetas + diff --git a/res/values-fr/e_strings.xml b/res/values-fr/e_strings.xml new file mode 100644 index 000000000..e3ae508a4 --- /dev/null +++ b/res/values-fr/e_strings.xml @@ -0,0 +1,6 @@ + + + Sélectionner un dossier + Choisir un dossier + Dossiers + diff --git a/res/values-it/e_strings.xml b/res/values-it/e_strings.xml new file mode 100644 index 000000000..604d8b9a7 --- /dev/null +++ b/res/values-it/e_strings.xml @@ -0,0 +1,6 @@ + + + Seleziona cartella + Scegli una cartella + Cartelle + diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml new file mode 100755 index 000000000..290dcbbbf --- /dev/null +++ b/res/values/e_strings.xml @@ -0,0 +1,6 @@ + + + Select folder + Choose a folder + Folders + diff --git a/src/com/android/gallery3d/app/AlbumPicker.java b/src/com/android/gallery3d/app/AlbumPicker.java index 8c2d09a0e..9a0107412 100644 --- a/src/com/android/gallery3d/app/AlbumPicker.java +++ b/src/com/android/gallery3d/app/AlbumPicker.java @@ -27,7 +27,7 @@ public class AlbumPicker extends PickerActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setTitle(R.string.select_album); + setTitle(R.string.e_select_album); Intent intent = getIntent(); Bundle extras = intent.getExtras(); Bundle data = extras == null ? new Bundle() : new Bundle(extras); diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index c4d1d0234..fbf3aa1c8 100755 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -595,7 +595,7 @@ public class AlbumSetPage extends ActivityState implements mActionBar.setTitle(GalleryUtils.getSelectionModePrompt(typeBits)); } else if (mGetAlbum) { inflater.inflate(R.menu.pickup, menu); - mActionBar.setTitle(R.string.select_album); + mActionBar.setTitle(R.string.e_select_album); } else { inflater.inflate(R.menu.albumset, menu); boolean wasShowingClusterMenu = mShowClusterMenu; @@ -611,7 +611,7 @@ public class AlbumSetPage extends ActivityState implements // mActionBar.getClusterTypeAction() == FilterUtils.CLUSTER_BY_ALBUM; MenuItem selectItem = menu.findItem(R.id.action_select); selectItem.setTitle(activity.getString( - selectAlbums ? R.string.select_album : R.string.select_group)); + selectAlbums ? R.string.e_select_album : R.string.select_group)); MenuItem cameraItem = menu.findItem(R.id.action_camera); cameraItem.setVisible(GalleryUtils.isAnyCameraAvailable(activity)); @@ -627,7 +627,7 @@ public class AlbumSetPage extends ActivityState implements MenuItem moreItem = menu.findItem(R.id.action_more_image); moreItem.setVisible(mActivity.getResources().getBoolean( R.bool.config_show_more_images)); - mActionBar.setTitle(R.string.albums_title); + mActionBar.setTitle(R.string.e_albums_title); } for(int i = 0; i < menu.size(); i++) { diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java index 14689a555..6b571e132 100755 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -165,7 +165,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On private static final ActionItem[] sActionItems = new ActionItem[] { new ActionItem(FilterUtils.CLUSTER_BY_TIME, R.string.timeline_title, R.drawable.timeline), - new ActionItem(FilterUtils.CLUSTER_BY_ALBUM, R.string.albums_title, + new ActionItem(FilterUtils.CLUSTER_BY_ALBUM, R.string.e_albums_title, R.drawable.albums), new ActionItem(FilterUtils.CLUSTER_BY_VIDEOS, R.string.videos_title, R.drawable.videos) }; @@ -287,7 +287,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On } else { mDrawerLayoutSupported = true; startTimelinePage(); - mToolbar.setTitle(R.string.albums_title); + mToolbar.setTitle(R.string.e_albums_title); } toggleNavBar(mDrawerLayoutSupported); } -- GitLab