diff --git a/res/layout/choose_widget_type.xml b/res/layout/choose_widget_type.xml index 772bc317b2d52f5df77a73c1eef37a4e2dcb041a..60f2bf6097f3630f445076f338670205e6fd4b95 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 8758d9b83695954acbb14f33485be958931135cb..dd77632f08989c2575b6c419f9c36ad3d509e57f 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 0000000000000000000000000000000000000000..e40a3b04f2d676a14279231538385bfc65d5ac16 --- /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 0000000000000000000000000000000000000000..e3ae508a450e5d9688a15d08f5256d8a5078e064 --- /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 0000000000000000000000000000000000000000..604d8b9a70b9766d3f148f8a4c19e5a9f379a0e3 --- /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 0000000000000000000000000000000000000000..290dcbbbfcce8c3be118d0a52f0476f43baa3820 --- /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 8c2d09a0ee1117abadd660e3297dc16eeccc6624..9a0107412f3d5ccf84f335cba229059ace85ea0d 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 c4d1d0234d29971b40152ef3e0054b695247cbc9..fbf3aa1c893420f387645ed495f5c7643a1df698 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 27e9f9ad51412cd5f74a333fc35b61eb62eba008..b68153cb8c7fe6f6588cd1b0601189e9ffe8587a 100755 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -166,7 +166,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) }; @@ -288,7 +288,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); }