Refactored MemoListView. Added missing localization strings.

Change-Id: I0fbd27ce3dd000dca02d0d299ff5132af36344b3
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/lib-apps-common/src/Ux/SelectView.cpp b/lib-apps-common/src/Ux/SelectView.cpp
index a6453dbb3c9d2b7dbfff901745485d10c6c35102..6115fed7c677d37cc35360bca4bbe92caaec69eb 100644 (file)
--- a/lib-apps-common/src/Ux/SelectView.cpp
+++ b/lib-apps-common/src/Ux/SelectView.cpp
@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <notification.h>
 
-#define TITLE_BUFFER_SIZE 32
+#define TITLE_BUFFER_SIZE 64
 #define POPUP_BUFFER_SIZE 256
 
 using namespace Ux;
@@ -169,6 +169,11 @@ void SelectView::onPageAttached(Ui::NavigatorPage *page)
 {
        updatePageTitle();
        updatePageButtons();
+
+       evas_object_smart_callback_add(getEvasObject(), "language,changed",
+               [](void *data, Evas_Object *, void *) {
+                       ((SelectView *) data)->updatePageTitle();
+               }, this);
 }
 
 bool SelectView::onBackPressed()

diff --git a/lib-common/inc/Common/Strings.h b/lib-common/inc/Common/Strings.h
deleted file mode 100644 (file)
index 0f8e4cd..0000000
--- a/lib-common/inc/Common/Strings.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2016 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef COMMON_STRINGS_H
-#define COMMON_STRINGS_H
-
-#include "Ux/SelectView.h"
-
-#include <tizen.h>
-
-namespace Common
-{
-       /**
-        * @return Default translatable strings table for Ux::SelectView.
-        */
-       EXPORT_API const Ux::SelectView::Strings &getSelectViewStrings();
-}
-
-#endif /* COMMON_STRINGS_H */

diff --git a/lib-common/src/Common/Strings.cpp b/lib-common/src/Common/Strings.cpp
deleted file mode 100644 (file)
index 89c6d25..0000000
--- a/lib-common/src/Common/Strings.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2016 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Common/Strings.h"
-
-namespace
-{
-       Ux::SelectView::Strings selectViewStrings = {
-               "IDS_MEMO_HEADER_SELECT_ALL_ABB3",
-               "IDS_TPLATFORM_ACBUTTON_DELETE_ABB",
-               "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB",
-               "IDS_MEMO_BODY_MEMO",
-               "IDS_MEMO_BODY_MEMO",
-               "IDS_MEMO_HEADER_SELECT_MEMOS_ABB",
-               "%d memos selected",
-               "%zu/%zu",
-               //FIXME: Find correct string MAXIMUM_NUMBER_OF_ITEMS_THAT_CAN_BE_SELECTED_HAS_BEEN_EXCEEDED.
-               ""
-       };
-}
-
-const Ux::SelectView::Strings &Common::getSelectViewStrings()
-{
-       return selectViewStrings;
-}

diff --git a/memo-app/inc/List/MemoListView.h b/memo-app/inc/List/MemoListView.h
index 3be36129fb02b59ea39118859e4bd8e4f6be38d5..112e61f182099f244a0a5381e13b120751813c86 100644 (file)
--- a/memo-app/inc/List/MemoListView.h
+++ b/memo-app/inc/List/MemoListView.h
@@ -53,41 +53,38 @@ namespace List
                virtual void onSelectModeChanged(Ux::SelectMode selectMode) override;
 
                void onDeleteSelected();
+               void onDeleteFinished();
+
                void onSearchSelected();
+               void onSearchFinished();
 
-               Ui::Gengrid *createGrid(Evas_Object *parent);
-               Evas_Object *createAddButton(Evas_Object *parent);
+               Evas_Object *createContent(Evas_Object *parent);
                Evas_Object *createNoContent(Evas_Object *parent);
+               Evas_Object *createSearchBar(Evas_Object *parent);
+               Evas_Object *createAddButton(Evas_Object *parent);
 
                void updateAddButton();
                void updateEmptyState();
                void updateTitle();
 
-               void onAddPressed(Evas_Object *button, void *eventInfo);
-               void onMemoListReceived();
                void onSearchResultChanged(MemoSearchItem *item, const Model::SearchResult *result);
                void onMemoUpdated(MemoSearchItem *memoItem, int changes);
                void onMemoDeleted(MemoSearchItem *memoItem);
-               void onMemoInserted(Model::DataItem &memo);
-
-               void onSelectFinished();
-
-               void onSearchStarted();
-               void onSearchChanged(const char *text);
-               void onSearchFinished();
+               void onMemoInserted(Model::DataItem &dataItem);
 
-               MemoSearchItem *createItem(Model::DataItem &memo);
+               MemoSearchItem *createItem(Model::DataItem &dataItem);
                void insertItem(MemoSearchItem *item);
                bool isEmpty() const;
 
-               Common::Model::MemoProvider m_DataProvider;
-               Model::SearchProvider m_SearchProvider;
-               Evas_Object   *m_AlignLayout;
                Evas_Object   *m_Bg;
-               Evas_Object   *m_AddButton;
+               Evas_Object   *m_Content;
+               Ui::Gengrid   *m_Gengrid;
                SearchBar     *m_SearchBar;
-               Ui::Gengrid   *m_GenGrid;
-               bool           m_SearchMode;
+               Evas_Object   *m_AddButton;
+               bool           m_IsSearching;
+
+               Common::Model::MemoProvider m_DataProvider;
+               Model::SearchProvider m_SearchProvider;
        };
 }
 

diff --git a/memo-app/inc/List/MemoSearchItem.h b/memo-app/inc/List/MemoSearchItem.h
index cec447e746a1cdb71d8a905dbc688d74b66a8484..9e8c62d533d4e881a36599d3ef3925a8b8474b94 100644 (file)
--- a/memo-app/inc/List/MemoSearchItem.h
+++ b/memo-app/inc/List/MemoSearchItem.h
@@ -22,11 +22,12 @@
 namespace Model
 {
        class SearchData;
-       class SearchResult;
 }
 
 namespace List
 {
+       class SearchMultiResult;
+
        /**
         * @brief Memo search grid item.
         */
@@ -38,13 +39,12 @@ namespace List
                /**
                 * @return Current search result or nullptr if item doesn't match.
                 */
-               const Model::SearchResult *getSearchResult() const;
+               const SearchMultiResult *getSearchResult() const;
 
                /**
-                * @brief Set current search result to highlight it in the item.
-                * @param[in]   result  Search result for this item
+                * @brief Update the item to highlight current search result.
                 */
-               void setSearchResult(const Model::SearchResult *result);
+               void updateSearchResult();
 
        protected:
                virtual char *getText(Evas_Object *parent, const char *part) override;
@@ -52,7 +52,6 @@ namespace List
 
        private:
                Model::SearchData &m_SearchData;
-               bool m_Highlight;
        };
 }
 

diff --git a/memo-app/res/po/ar.po b/memo-app/res/po/ar.po
index 247ca027aa2ec770f2228a0c1d173bfefd448656..96d911ae3605396ebffc19155a1c67a6529d90eb 100644 (file)
--- a/memo-app/res/po/ar.po
+++ b/memo-app/res/po/ar.po
@@ -298,6 +298,9 @@ msgstr "حذف"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "سيتم عرض المذكرات هنا بعد إنشائها."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "تم تحديد %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "تم بلوغ الحد الأقصى لعدد الصور (%d)."
 
@@ -331,3 +334,6 @@ msgstr "تم إلغاء التسجيل. إن التسجيل قصير للغاي
 msgid "IDS_MEMO_SK_OK"
 msgstr "موافق"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "تحديد مذكرة"
+

diff --git a/memo-app/res/po/az.po b/memo-app/res/po/az.po
index 79ee681ca08632167898ae8171ee35e894fc92a1..0a8e532a95c7fb269a93fe342fca7e19ef1a439b 100644 (file)
--- a/memo-app/res/po/az.po
+++ b/memo-app/res/po/az.po
@@ -298,6 +298,9 @@ msgstr "Sil"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Yaddaş qeydləri yaratdıqdan sonra onlar burada görünəcək."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d seçilmişdir"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Şəkillərin sayı maksimuma (%d) çatıb."
 
@@ -331,3 +334,6 @@ msgstr "Yazılış ləğv edildi. Yazı çox qısadır."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Yaddaş seç"
+

diff --git a/memo-app/res/po/bg.po b/memo-app/res/po/bg.po
index 32d53934e132d0d7556619abd47e65398f71cbd0..e8ad3c5f2a1bf09facc3f0b9cbb29fece410c655 100644 (file)
--- a/memo-app/res/po/bg.po
+++ b/memo-app/res/po/bg.po
@@ -298,6 +298,9 @@ msgstr "Изтриване"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "След като създадете паметни бележки, те ще се покажат тук."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d избрани"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Достигнат е максималният брой изображения (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Записването е отменено. Записът е твърд
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Избор на записка"
+

diff --git a/memo-app/res/po/ca.po b/memo-app/res/po/ca.po
index 6d2102774bb4725870584624c46cc3f9b1cd8472..f192522cb1666582383acda3200058129bbf3a9c 100644 (file)
--- a/memo-app/res/po/ca.po
+++ b/memo-app/res/po/ca.po
@@ -298,6 +298,9 @@ msgstr "Esborrar"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Quan hagi creat notes, es mostraran aquí."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d seleccionat"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "S'ha assolit el nombre màxim d'imatges (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Gravació cancel·lada. Gravació massa curta."
 msgid "IDS_MEMO_SK_OK"
 msgstr "Acceptar"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Seleccionar nota"
+

diff --git a/memo-app/res/po/cs.po b/memo-app/res/po/cs.po
index e7e441cb01b0384827505363f5109ad2ff4214cd..e9789848e8d27123a786d25dc02413288be6f428 100644 (file)
--- a/memo-app/res/po/cs.po
+++ b/memo-app/res/po/cs.po
@@ -298,6 +298,9 @@ msgstr "Odstranit"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Až vytvoříte poznámky, zobrazí se zde."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "Vybráno %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Bylo dosaženo maximálního počtu obrázků (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Nahrávání bylo zrušeno. Nahrávka je příliš krátká."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Zvolit poznámku"
+

diff --git a/memo-app/res/po/da.po b/memo-app/res/po/da.po
index b419a9e27e30bc0849dce06c9df440b4e43c745f..c4df63b0f65748a09f2299f21396acf831d9d3d4 100644 (file)
--- a/memo-app/res/po/da.po
+++ b/memo-app/res/po/da.po
@@ -298,6 +298,9 @@ msgstr "Slet"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Når du har oprettet notater, vises de her."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d valgt"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Det maksimale antal billeder (%d) er nået."
 
@@ -331,3 +334,6 @@ msgstr "Optagelse annulleret. Optagelse for kort."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Vælg notat"
+

diff --git a/memo-app/res/po/de.po b/memo-app/res/po/de.po
index 98053fe96eb9498a78f600352c6d1ca8ff4fbdaf..c45a8bbad6e9d5116e9f1a48e1f29f7c6f5ed0ca 100644 (file)
--- a/memo-app/res/po/de.po
+++ b/memo-app/res/po/de.po
@@ -298,6 +298,9 @@ msgstr "Löschen"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Nach dem Erstellen von Memos werden diese hier angezeigt."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d ausgewählt."
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Maximale Anzahl an Bildern (%d) erreicht."
 
@@ -331,3 +334,6 @@ msgstr "Aufnahme abgebrochen. Aufnahme zu kurz."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Memo wählen"
+

diff --git a/memo-app/res/po/el_GR.po b/memo-app/res/po/el_GR.po
index 199c08f16483749b46f5a9be9a5c021bc6dabc85..d587b7f597d88d36230b00dd7cb61aabab9b70c5 100644 (file)
--- a/memo-app/res/po/el_GR.po
+++ b/memo-app/res/po/el_GR.po
@@ -298,6 +298,9 @@ msgstr "Διαγραφή"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Τα στοιχεία θα εμφανιστούν εδώ, μετά την δημιουργία σημειωμάτων."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "Επιλέχθ. %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Συμπληρώθηκε ο μέγιστος αριθμός εικόνων (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Η εγγραφή ακυρώθηκε. Η διάρκειά της ήτα
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Επιλογή σημειώματος"
+

diff --git a/memo-app/res/po/en.po b/memo-app/res/po/en.po
index a0c6495bbbd44b2ce9bc8f1573b608864c39dda1..50cb37ab96f710bfe8f1556a6b8672f782d159ce 100644 (file)
--- a/memo-app/res/po/en.po
+++ b/memo-app/res/po/en.po
@@ -298,6 +298,9 @@ msgstr "Delete"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "After you create memos, they will be shown here."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d selected"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Maximum number of images (%d) reached."
 
@@ -331,3 +334,6 @@ msgstr "Recording cancelled. Recording too short."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Select memo"
+

diff --git a/memo-app/res/po/en_PH.po b/memo-app/res/po/en_PH.po
index 9e71205e4697bf877f328c7de83765a0432255aa..cb7807a5ef950c3784b0bc53e71f5ecb2dd8f2f6 100644 (file)
--- a/memo-app/res/po/en_PH.po
+++ b/memo-app/res/po/en_PH.po
@@ -298,6 +298,9 @@ msgstr "Delete"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "After you create memos, they will be shown here."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d selected"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Maximum number of images (%d) reached."
 
@@ -331,3 +334,6 @@ msgstr "Recording canceled. Recording too short."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Select memo"
+

diff --git a/memo-app/res/po/en_US.po b/memo-app/res/po/en_US.po
index f0073be49e2c5f962db83f19349c0ebdfd79a08f..77e399790688b6cffd01411b0e195c37a81741ac 100644 (file)
--- a/memo-app/res/po/en_US.po
+++ b/memo-app/res/po/en_US.po
@@ -298,6 +298,9 @@ msgstr "Delete"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "After you create memos, they will be shown here."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d selected"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Maximum number of images (%d) reached."
 
@@ -331,3 +334,6 @@ msgstr "Recording canceled. Recording too short."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Select memo"
+

diff --git a/memo-app/res/po/es_ES.po b/memo-app/res/po/es_ES.po
index 9665a9a8afacec27dddf91c0f8590bab299b4581..3bfd0ebc432c52a5ba78d7330b1dd9bbef1fb173 100644 (file)
--- a/memo-app/res/po/es_ES.po
+++ b/memo-app/res/po/es_ES.po
@@ -298,6 +298,9 @@ msgstr "Eliminar"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Después de crear notas, se mostrarán aquí."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d selecc."
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Se ha alcanzado el número máximo de imágenes (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Grabación cancelada. Grabación demasiado corta."
 msgid "IDS_MEMO_SK_OK"
 msgstr "Aceptar"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Seleccionar nota"
+

diff --git a/memo-app/res/po/es_US.po b/memo-app/res/po/es_US.po
index a041a9ae1216e17063eea6221dd8459df899b494..330f18d22b4a6b47d8a74e187b0c206eb2ec1a52 100644 (file)
--- a/memo-app/res/po/es_US.po
+++ b/memo-app/res/po/es_US.po
@@ -298,6 +298,9 @@ msgstr "Eliminar"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Cuando se crean notas, éstas se mostrarán aquí."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d selecc."
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Se alcanzó el número máximo de imágenes (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Grabación cancelada. Grabación demasiado corta."
 msgid "IDS_MEMO_SK_OK"
 msgstr "Aceptar"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Seleccionar nota"
+

diff --git a/memo-app/res/po/et.po b/memo-app/res/po/et.po
index e5fa0e3d076e2beb8016d63dc25e539a636ef878..5524a3ec9b4eaec8f3dd0d6d7a50d5ba7982ad9c 100644 (file)
--- a/memo-app/res/po/et.po
+++ b/memo-app/res/po/et.po
@@ -298,6 +298,9 @@ msgstr "Kustuta"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Memod kuvatakse siin pärast nende loomist."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d on valitud"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Piltide maksimaalne arv (%d) on saavutatud."
 
@@ -331,3 +334,6 @@ msgstr "Salvestamine on tühistatud. Salvestis on liiga lühike."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Vali memo"
+

diff --git a/memo-app/res/po/eu.po b/memo-app/res/po/eu.po
index 0a20489880bb184fcff83804ced19b67d47cda58..9c9bc356ea723748300ac48d8e259c933ecba70d 100644 (file)
--- a/memo-app/res/po/eu.po
+++ b/memo-app/res/po/eu.po
@@ -298,6 +298,9 @@ msgstr "Ezabatu"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Oroigarriak sortu ondoren, hemen erakutsiko dira."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d aukeratuta"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Gehieneko irudi kopurura (%d) iritsi zara."
 
@@ -331,3 +334,6 @@ msgstr "Grabaketa etenda. Grabaketa laburregia da."
 msgid "IDS_MEMO_SK_OK"
 msgstr "Ados"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Aukeratu oroigarria"
+

diff --git a/memo-app/res/po/fi.po b/memo-app/res/po/fi.po
index 82d0210a5ecc662ac810d8c0e502a38177b804c3..9e7d5dea5b0423ee88ea15bb1a3197208c80d812 100644 (file)
--- a/memo-app/res/po/fi.po
+++ b/memo-app/res/po/fi.po
@@ -298,6 +298,9 @@ msgstr "Poista"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Kun olet luonut muistioita, ne näytetään täällä."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d valittu"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Kuvien enimmäismäärä (%d) on saavutettu."
 
@@ -331,3 +334,6 @@ msgstr "Tallennus peruutettu. Tallenne on liian lyhyt."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Valitse muistio"
+

diff --git a/memo-app/res/po/fr.po b/memo-app/res/po/fr.po
index 06915437de2b66537eb1dfaba1f058f42584e36b..41c9ec4ba6918b24a6b384380f68681836637758 100644 (file)
--- a/memo-app/res/po/fr.po
+++ b/memo-app/res/po/fr.po
@@ -298,6 +298,9 @@ msgstr "Supprimer"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Les mémos créés seront affichés ici."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d sélection."
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Nombre maximum d'images (%d) atteint."
 
@@ -331,3 +334,6 @@ msgstr "Enregistrement annulé. Celui-ci est trop court."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Sélectionner mémo"
+

diff --git a/memo-app/res/po/fr_CA.po b/memo-app/res/po/fr_CA.po
index e38ea64f69f099dd3bd0f5f6879fcfe12966b214..71ff3952d00b9e6d1a2525e7a8d574f9a383fe23 100644 (file)
--- a/memo-app/res/po/fr_CA.po
+++ b/memo-app/res/po/fr_CA.po
@@ -298,6 +298,9 @@ msgstr "Supprimer"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Les mémos créés seront affichés ici."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d sélection."
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Nombre maximum d'images (%d) atteint."
 
@@ -331,3 +334,6 @@ msgstr "Enregistrement annulé. Celui-ci est trop court."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Sélectionner note"
+

diff --git a/memo-app/res/po/ga.po b/memo-app/res/po/ga.po
index def3cbbe7d581c035140a02033d2b2e911df474f..d36ff10c3d2bb07106d7be7950a81d5533fa34f4 100644 (file)
--- a/memo-app/res/po/ga.po
+++ b/memo-app/res/po/ga.po
@@ -298,6 +298,9 @@ msgstr "Scrios"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Tar éis duit meabhráin a chruthú, taispeánfar anseo iad."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d roghnaithe"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Uaslíon na n-íomhánna (%d) bainte amach."
 
@@ -331,3 +334,6 @@ msgstr "Taifeadadh curtha ar ceal. Taifeadadh róghearr."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Roghnaigh meabhrán"
+

diff --git a/memo-app/res/po/gl.po b/memo-app/res/po/gl.po
index 8fea6906b3a6782074a5664e9e0ba4daf3cfe75a..791d670f2c20edca6cbd4e4bc370c01c30cfcc36 100644 (file)
--- a/memo-app/res/po/gl.po
+++ b/memo-app/res/po/gl.po
@@ -298,6 +298,9 @@ msgstr "Eliminar"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Despois de crear notas, estas amosaranse aquí."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d seleccion."
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Alcanzouse o número máximo de imaxes (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Gravación cancelada. A gravación é demasiado curta."
 msgid "IDS_MEMO_SK_OK"
 msgstr "Aceptar"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Seleccionar nota"
+

diff --git a/memo-app/res/po/hr.po b/memo-app/res/po/hr.po
index 8840d0f690ead57b3c47e006797f2a5727eff378..a791d7231ddf9fbd63d79abb721377bc7c7d038c 100644 (file)
--- a/memo-app/res/po/hr.po
+++ b/memo-app/res/po/hr.po
@@ -298,6 +298,9 @@ msgstr "Obriši"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Nakon što kreirate podsjetnike, prikazat će se ovdje."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d odabrano"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Dostignut maksimalni broj slika (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Snimanje prekinuto. Snimka je prekratka."
 msgid "IDS_MEMO_SK_OK"
 msgstr "U redu"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Odaberite bilješku"
+

diff --git a/memo-app/res/po/hu.po b/memo-app/res/po/hu.po
index 407eb41e4c10a179f136f3a38a4762bf7c18c354..8fc36fbb2a7df6b7f6eeacdd0c47ac82aa323028 100644 (file)
--- a/memo-app/res/po/hu.po
+++ b/memo-app/res/po/hu.po
@@ -206,7 +206,7 @@ msgid "IDS_MEMO_NPBODY_ENTER_CURRENT_PIN_ABB"
 msgstr "Adja meg az aktuális PIN-t"
 
 msgid "IDS_MEMO_BODY_THE_PINS_DO_NOT_MATCH"
-msgstr "A PIN kódok nem egyeznek."
+msgstr "A PIN-kódok nem egyeznek."
 
 msgid "IDS_MEMO_BODY_CREATE_QUICK_MEMOS_AT_ANY_TIME_BY_COPYING_TEXT_AND_TAPPING_THE_QUICK_MEMO_ICON_N_NTAP_HERE_TO_CREATE_A_QUICK_MEMO"
 msgstr "Bármikor létrehozhat gyorsjegyzetet úgy, hogy a vágólapra másolja a kívánt szöveget, és megérinti a Gyorsjegyzet ikont.\n\nÉrintse meg itt gyorsjegyzet létrehozásához."
@@ -298,6 +298,9 @@ msgstr "Töröl"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Itt jelennek majd meg a létrehozott jegyzetek."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d kijelölve"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Elérte a képek maximális számát (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Megszakította a rögzítést. Túl rövid a felvétel."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Jegyzet kiválasztása"
+

diff --git a/memo-app/res/po/hy.po b/memo-app/res/po/hy.po
index 043a312ccf6c09aabdc0cf64e0d5948298b0f445..2660b87dee10488698f96ac2082ab8c005fffe08 100644 (file)
--- a/memo-app/res/po/hy.po
+++ b/memo-app/res/po/hy.po
@@ -298,6 +298,9 @@ msgstr "Ջնջել"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Ստեղծումից հետո հուշակները կցուցադրվեն այստեղ:"
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d ընտրված"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Հասել է պատկերների առավելագույն քանակին (%d):"
 
@@ -331,3 +334,6 @@ msgstr "Ձայնագրումը դադարեցվեց: Ձայնագրությու
 msgid "IDS_MEMO_SK_OK"
 msgstr "Ընդունել"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Ընտրել հուշագիր"
+

diff --git a/memo-app/res/po/is.po b/memo-app/res/po/is.po
index a5a8fb24b1a57f47b3f4205076e6b4d0ce64a106..bb89b681b1a64cf3d9b70cf02eb31dc2439602ae 100644 (file)
--- a/memo-app/res/po/is.po
+++ b/memo-app/res/po/is.po
@@ -298,6 +298,9 @@ msgstr "Eyða"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Minnismiðar birtast hér eftir að þeir eru búnir til."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d valið"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Hámarksfjölda mynda (%d) hefur verið náð."
 
@@ -331,3 +334,6 @@ msgstr "Hætt við upptöku. Upptakan er of stutt."
 msgid "IDS_MEMO_SK_OK"
 msgstr "Í lagi"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Velja minnismiða"
+

diff --git a/memo-app/res/po/it_IT.po b/memo-app/res/po/it_IT.po
index 32ee5e8fe4fda058fad92eb299f7d6104903a461..5b93ff4c6284dcb4e9ee410061882578078977f9 100644 (file)
--- a/memo-app/res/po/it_IT.po
+++ b/memo-app/res/po/it_IT.po
@@ -298,6 +298,9 @@ msgstr "Elimina"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Una volta creati, i promemoria vengono visualizzati qui."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d selezionate"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Il numero massimo di immagini (%d) è stato raggiunto."
 
@@ -331,3 +334,6 @@ msgstr "Registrazione annullata perché troppo breve."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Seleziona promemoria"
+

diff --git a/memo-app/res/po/ja_JP.po b/memo-app/res/po/ja_JP.po
index 704424bdf647aa0d85b99c9b9dd63567ce52e841..3cf76085eca640481ef32638a6305138f8b85c15 100644 (file)
--- a/memo-app/res/po/ja_JP.po
+++ b/memo-app/res/po/ja_JP.po
@@ -298,6 +298,9 @@ msgstr "削除"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "メモを作成すると、ここに表示されます。"
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d件選択"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "画像の最大件数(%d件)に達しました。"
 
@@ -331,3 +334,6 @@ msgstr "録音を中止しました。録音時間が短すぎます。"
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "メモを選択"
+

diff --git a/memo-app/res/po/ka.po b/memo-app/res/po/ka.po
index 9dc6598018466086b862985967814cd1cee54746..7466373372de0a488f24f72825a92ba5e2c4128b 100644 (file)
--- a/memo-app/res/po/ka.po
+++ b/memo-app/res/po/ka.po
@@ -298,6 +298,9 @@ msgstr "წაშლა"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "როდესაც შეხსენებებს შექმნით, ისინი გამოჩნდება აქ."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d არჩეულია"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "მიღწეულია სურათების მაქსიმალური რაოდენობა (%d)."
 
@@ -331,3 +334,6 @@ msgstr "ჩაწერა გაუქმდა. ჩანაწერი ძ
 msgid "IDS_MEMO_SK_OK"
 msgstr "კი"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "შეხსენების შერჩევა"
+

diff --git a/memo-app/res/po/kk.po b/memo-app/res/po/kk.po
index 0e1cfbafdcf1e83bd933d3db2ffdf9a51f4b6f29..882f7e39c4f33b94d8e1cc12d2ccac1af6792cae 100644 (file)
--- a/memo-app/res/po/kk.po
+++ b/memo-app/res/po/kk.po
@@ -298,6 +298,9 @@ msgstr "Жою"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Жазбалар жасағаннан кейін, олар осы жерде көрсетіледі."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d таңдалды"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Ең көп суреттер санына (%d) жетті."
 
@@ -331,3 +334,6 @@ msgstr "Жазу болдырылмады. Жазба тым қысқа."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Ескерту таңдау"
+

diff --git a/memo-app/res/po/ko_KR.po b/memo-app/res/po/ko_KR.po
index 779de71933d7c2567d5ae22dcbcb9281f2d51dd1..0e2e7fc15ae4e416eed3f38762ccf79e7c8ee393 100644 (file)
--- a/memo-app/res/po/ko_KR.po
+++ b/memo-app/res/po/ko_KR.po
@@ -59,7 +59,7 @@ msgid "IDS_MEMO_NPBODY_NO_MEMOS"
 msgstr "메모가 없습니다"
 
 msgid "IDS_MEMO_TPOP_MAXIMUM_IMAGE_SIZE_EXCEEDED_RESIZING_ING"
-msgstr "ìµ\9cë\8c\80 ì\9d´ë¯¸ì§\80 í\81¬ê¸°ë¥¼ ì´\88ê³¼í\95\98ì\98\80습니다. 크기 조절 중..."
+msgstr "ìµ\9cë\8c\80 ì\9d´ë¯¸ì§\80 í\81¬ê¸°ë¥¼ ì´\88ê³¼í\96\88습니다. 크기 조절 중..."
 
 msgid "IDS_MEMO_OPT_REMOVE"
 msgstr "삭제"
@@ -158,7 +158,7 @@ msgid "IDS_MEMO_NPBODY_NO_RESULTS_FOUND"
 msgstr "검색 결과가 없습니다"
 
 msgid "IDS_MEMO_TPOP_CONTENT_ADDED_TO_QUICK_MEMO"
-msgstr "í\80µ ë©\94모ì\97\90 ë\82´ì\9a©ì\9d\84 ì¶\94ê°\80í\95\98ì\98\80습니다."
+msgstr "í\80µ ë©\94모ì\97\90 ë\82´ì\9a©ì\9d\84 ì¶\94ê°\80í\96\88습니다."
 
 msgid "IDS_MEMO_HEADER_ENTER_PIN"
 msgstr "PIN 입력"
@@ -215,7 +215,7 @@ msgid "IDS_MEMO_TPOP_UNABLE_TO_PLAY_DURING_CALL"
 msgstr "통화 중에는 재생할 수 없습니다."
 
 msgid "IDS_MEMO_TPOP_RECORDING_SAVED"
-msgstr "ë\85¹ì\9d\8cì\9d\84 ì \80ì\9e¥í\95\98ì\98\80습니다."
+msgstr "ë\85¹ì\9d\8cì\9d\84 ì \80ì\9e¥í\96\88습니다."
 
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED"
 msgstr "%d자까지 입력할 수 있습니다."
@@ -239,7 +239,7 @@ msgid "IDS_MEMO_TPOP_UNABLE_TO_RECORD_AUDIO_NOT_ENOUGH_SPACE_IN_DEVICE_STORAGE"
 msgstr "디바이스에 저장공간이 부족하여 오디오를 녹음할 수 없습니다."
 
 msgid "IDS_MEMO_TPOP_MAXIMUM_RECORDING_TIME_REACHED"
-msgstr "ìµ\9cë\8c\80 ì´¬ì\98\81 ì\8b\9cê°\84ì\97\90 ë\8f\84ë\8b¬í\95\98ì\98\80습니다."
+msgstr "ìµ\9cë\8c\80 ì´¬ì\98\81 ì\8b\9cê°\84ì\97\90 ë\8f\84ë\8b¬í\96\88습니다."
 
 msgid "IDS_MEMO_POP_THIS_QUICK_MEMO_WILL_BE_DELETED_MSG"
 msgstr "이 퀵 메모를 삭제합니다.\n\n텍스트를 복사하고 퀵 메모 아이콘을 눌러 언제든지 새 퀵 메모를 추가하세요."
@@ -287,7 +287,7 @@ msgid "IDS_MEMO_OPT_SHARE"
 msgstr "공유"
 
 msgid "IDS_MEMO_POP_DELETED"
-msgstr "ì\82­ì \9cí\95\98ì\98\80습니다."
+msgstr "ì\82­ì \9cí\96\88습니다."
 
 msgid "IDS_MEMO_POP_THIS_MEMO_WILL_BE_DELETED"
 msgstr "메모를 삭제합니다."
@@ -298,17 +298,20 @@ msgstr "삭제"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "새 메모를 추가하면 여기에 표시됩니다."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d개 선택"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
-msgstr "ìµ\9cë\8c\80 ì\9d´ë¯¸ì§\80 ì\88\98(%d)ì\97\90 ë\8f\84ë\8b¬í\95\98ì\98\80습니다."
+msgstr "ìµ\9cë\8c\80 ì\9d´ë¯¸ì§\80 ì\88\98(%d)ì\97\90 ë\8f\84ë\8b¬í\96\88습니다."
 
 msgid "IDS_MEMO_TPOP_FAILED_TO_INSERT_IMAGE"
-msgstr "ì\9d´ë¯¸ì§\80를 ì\82½ì\9e\85í\95\98ì§\80 못í\95\98ì\98\80습니다."
+msgstr "ì\9d´ë¯¸ì§\80를 ì\82½ì\9e\85í\95\98ì§\80 못í\96\88습니다."
 
 msgid "IDS_IDLE_HEADER_NOT_ENOUGH_SPACE_ABB2"
 msgstr "저장공간 부족"
 
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
-msgstr "ìµ\9cë\8c\80 ê¸\80ì\9e\90 ì\88\98ì\97\90 ë\8f\84ë\8b¬í\95\98ì\98\80습니다."
+msgstr "ìµ\9cë\8c\80 ê¸\80ì\9e\90 ì\88\98ì\97\90 ë\8f\84ë\8b¬í\96\88습니다."
 
 msgid "IDS_MEMO_TPOP_RESOLUTION_NOT_SUPPORTED_BY_MEMO"
 msgstr "메모 앱에서 지원되지 않는 해상도입니다."
@@ -326,8 +329,11 @@ msgid "IDS_MEMO_HEADER_DISCARD_RECORDING_ABB"
 msgstr "녹음 내용 저장 안 함"
 
 msgid "IDS_MEMO_TPOP_RECORDING_CANCELLED_RECORDING_TOO_SHORT"
-msgstr "ë\85¹ì\9d\8c ì\8b\9cê°\84ì\9d´ ë\84\88무 짧ì\95\84 ë\85¹ì\9d\8cì\9d\84 ì·¨ì\86\8cí\95\98ì\98\80습니다."
+msgstr "ë\85¹ì\9d\8c ì\8b\9cê°\84ì\9d´ ë\84\88무 짧ì\95\84 ë\85¹ì\9d\8cì\9d\84 ì·¨ì\86\8cí\96\88습니다."
 
 msgid "IDS_MEMO_SK_OK"
 msgstr "확인"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "메모 선택"
+

diff --git a/memo-app/res/po/lt.po b/memo-app/res/po/lt.po
index 590cc516013a99613616df341eecf1f46e9989dd..2e9078e22db2f3e6dfd1ef690b54d77b70d43aa2 100644 (file)
--- a/memo-app/res/po/lt.po
+++ b/memo-app/res/po/lt.po
@@ -298,6 +298,9 @@ msgstr "Trinti"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Kai sukursite įrašų, jie bus rodomi čia."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "Pasirinkta: %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Pasiektas didžiausias vaizdų skaičius (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Įrašymas atšauktas. Įrašas per trumpas."
 msgid "IDS_MEMO_SK_OK"
 msgstr "Gerai"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Pasirinkite įrašą"
+

diff --git a/memo-app/res/po/lv.po b/memo-app/res/po/lv.po
index 293de199f4baa537b71b516aec2e6577f7ce0f1f..6653563f7d13ee9a9b729abe9b492f68d4530e16 100644 (file)
--- a/memo-app/res/po/lv.po
+++ b/memo-app/res/po/lv.po
@@ -298,6 +298,9 @@ msgstr "Dzēst"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Pēc atgādņu izveides tās tiks parādītas šeit."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "Izvēlētas %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Sasniegts maksimālais attēlu skaits (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Ierakstīšana ir atcelta. Ieraksts ir pārāk īss."
 msgid "IDS_MEMO_SK_OK"
 msgstr "Labi"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Piezīmes izvēle"
+

diff --git a/memo-app/res/po/mk.po b/memo-app/res/po/mk.po
index 4e1db0ed10a5748b3074fa1a4e6d485092f69cd9..dbd09ff68a539e0370be21da0aceb4194eb54948 100644 (file)
--- a/memo-app/res/po/mk.po
+++ b/memo-app/res/po/mk.po
@@ -298,6 +298,9 @@ msgstr "Избриши"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Откако ќе направите белешки, ќе се прикажат тука."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d избрани"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Достигнат е максималниот број слики (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Снимањето е откажано. Снимката е премно
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Избери белешка"
+

diff --git a/memo-app/res/po/nb.po b/memo-app/res/po/nb.po
index 1033db402df3c9fbb744898d0709e1c2f3e0f486..1aac7642bcfc4b6bb5447ebf7dbcdff20c76d9a5 100644 (file)
--- a/memo-app/res/po/nb.po
+++ b/memo-app/res/po/nb.po
@@ -298,6 +298,9 @@ msgstr "Slett"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Når du har opprettet notater, vises de her."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d valgt"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Maksimalt antall bilder (%d) er nådd."
 
@@ -331,3 +334,6 @@ msgstr "Opptaket er avbrutt. Opptaket er for kort."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Velg notat"
+

diff --git a/memo-app/res/po/nl.po b/memo-app/res/po/nl.po
index 1dc603277af3bd1dace3166547c075987c753f0c..7c5b271f480679f79011f6cca420229c6d12e22f 100644 (file)
--- a/memo-app/res/po/nl.po
+++ b/memo-app/res/po/nl.po
@@ -298,6 +298,9 @@ msgstr "Verwijderen"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Nadat u notities hebt gemaakt, worden ze hier weergegeven."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d geselecteerd"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Maximumaantal afbeeldingen (%d) bereikt."
 
@@ -331,3 +334,6 @@ msgstr "Opname geannuleerd. Opname te kort."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Notitie selecteren"
+

diff --git a/memo-app/res/po/pl.po b/memo-app/res/po/pl.po
index 41d67d7d210a9d9520f9af0fa3ff72138b42450a..6e7048a75e5a1153b239efc11e78db295212696b 100644 (file)
--- a/memo-app/res/po/pl.po
+++ b/memo-app/res/po/pl.po
@@ -298,6 +298,9 @@ msgstr "Usuń"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Notatki będą tutaj widoczne po ich utworzeniu."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "Wybranych: %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Osiągnięto maksymalną liczbę obrazów (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Nagrywanie anulowane. Nagranie zbyt krótkie."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Zaznaczanie notatki"
+

diff --git a/memo-app/res/po/pt_BR.po b/memo-app/res/po/pt_BR.po
index a4b0fcbb773563eaaeb52cb78d1b19b8fc227f8f..43e1322ac1ed289883b2fb5e105af46abe872472 100644 (file)
--- a/memo-app/res/po/pt_BR.po
+++ b/memo-app/res/po/pt_BR.po
@@ -298,6 +298,9 @@ msgstr "Excluir"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Após criar lembretes, eles serão exibidos aqui."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d selecionado(s)"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Número máximo de imagens (%d) atingido."
 
@@ -331,3 +334,6 @@ msgstr "Gravação cancelada. Gravação muito curta."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Selecionar nota"
+

diff --git a/memo-app/res/po/pt_PT.po b/memo-app/res/po/pt_PT.po
index d8ae849e93cb4508744191f80a92dee5437d1971..e9542861257bef3faba0f69a99b482463d052ab1 100644 (file)
--- a/memo-app/res/po/pt_PT.po
+++ b/memo-app/res/po/pt_PT.po
@@ -298,6 +298,9 @@ msgstr "Eliminar"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Depois de criar memorandos, estes serão mostrados aqui."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d seleccionada(s)"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Número máximo de imagens (%d) atingido."
 
@@ -331,3 +334,6 @@ msgstr "Gravação cancelada. Gravação demasiado curta."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Seleccionar memorando"
+

diff --git a/memo-app/res/po/ro.po b/memo-app/res/po/ro.po
index 0c9592a115146e500a5e294228f8d88909f414e3..8a6156b7ca65eb9b7fa2748206d502cf5c56570d 100644 (file)
--- a/memo-app/res/po/ro.po
+++ b/memo-app/res/po/ro.po
@@ -298,6 +298,9 @@ msgstr "Ștergere"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "După ce creați notițe, acestea vor fi afișate aici."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d selectate"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "A fost atins numărul maxim de imagini (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Înregistrarea a fost anulată. Aceasta este prea scurtă."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Selectare notă"
+

diff --git a/memo-app/res/po/ru_RU.po b/memo-app/res/po/ru_RU.po
index 299631d25743818a4d35844aad28ae8fea7c1eb6..b667865b63af323830438f3f66d4fe7c6ac814eb 100644 (file)
--- a/memo-app/res/po/ru_RU.po
+++ b/memo-app/res/po/ru_RU.po
@@ -298,6 +298,9 @@ msgstr "Удалить"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Здесь выводятся созданные записки."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "Выбрано: %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Достигнуто максимальное число изображений (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Запись отменена. Запись слишком коротк
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Выберите заметку"
+

diff --git a/memo-app/res/po/sk.po b/memo-app/res/po/sk.po
index 2d236a28886620813e490ae592fcefa20a7f6b7f..1fd73e507b57e67d646a986bafa8d4381210f943 100644 (file)
--- a/memo-app/res/po/sk.po
+++ b/memo-app/res/po/sk.po
@@ -298,6 +298,9 @@ msgstr "Odstrániť"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Po vytvorení pripomienok sa zobrazia tu."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "Vybraté: %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Dosiahol sa maximálny počet fotografií (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Nahrávanie sa zrušilo. Nahrávka bola príliš krátka."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Vyberte poznámku"
+

diff --git a/memo-app/res/po/sl.po b/memo-app/res/po/sl.po
index 2c589d63e2d56d845d29294de5bc8e15441a69f2..4bbf13c0cd817049f372d183363afd57fd5cca0d 100644 (file)
--- a/memo-app/res/po/sl.po
+++ b/memo-app/res/po/sl.po
@@ -298,6 +298,9 @@ msgstr "Izbriši"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Ko ustvarite beležke, bodo prikazane tukaj."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "Izbranih: %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Doseženo je največje dovoljeno število slik (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Snemanje preklicano. Posnetek je prekratek."
 msgid "IDS_MEMO_SK_OK"
 msgstr "V redu"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Izberi beležko"
+

diff --git a/memo-app/res/po/sr.po b/memo-app/res/po/sr.po
index 1845a0e2c48a6bfa9348babb6568e0015cf63c17..8a191960510132b90ab6cdf0f606fcbaf04e0f49 100644 (file)
--- a/memo-app/res/po/sr.po
+++ b/memo-app/res/po/sr.po
@@ -298,6 +298,9 @@ msgstr "Izbriši"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Nakon što kreiraš beleške, one će se prikazati ovde."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d je izabrano"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Dostignut je maksimalan broj slika (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Snimanje je otkazano. Snimanje je prekratko."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Izaberi belešku"
+

diff --git a/memo-app/res/po/sv.po b/memo-app/res/po/sv.po
index 8b021a22d1464932f9cad440b2d84baef4d2e54a..d54b617fb0f96fd5bc84e40933b21b6eeccd1c62 100644 (file)
--- a/memo-app/res/po/sv.po
+++ b/memo-app/res/po/sv.po
@@ -298,6 +298,9 @@ msgstr "Ta bort"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "När du har skapat memon visas de här."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d valda"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Det högsta antalet bilder (%d) har uppnåtts."
 
@@ -331,3 +334,6 @@ msgstr "Inspelningen har avbrutits. Inspelningen är för kort."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Välj memo"
+

diff --git a/memo-app/res/po/tr_TR.po b/memo-app/res/po/tr_TR.po
index aeb86029554536fd4febd487967cd34706f0ea64..b6fcd8d24d925481c62b323b7da1b588d524a3aa 100644 (file)
--- a/memo-app/res/po/tr_TR.po
+++ b/memo-app/res/po/tr_TR.po
@@ -298,6 +298,9 @@ msgstr "Sil"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Notlar oluşturulduktan sonra burada gösterilir."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d seçildi"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Maksimum resim sayısına (%d) ulaşıldı."
 
@@ -331,3 +334,6 @@ msgstr "Kayıt iptal edildi. Kayıt çok kısa."
 msgid "IDS_MEMO_SK_OK"
 msgstr "Tamam"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Not seçin"
+

diff --git a/memo-app/res/po/uk.po b/memo-app/res/po/uk.po
index 8abeed2ab9d119afd3681214d6f7b41d0e25f5e8..715719417fe7548a6aa3b9c6d5c8392693956a8b 100644 (file)
--- a/memo-app/res/po/uk.po
+++ b/memo-app/res/po/uk.po
@@ -298,6 +298,9 @@ msgstr "Видалити"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Після створення нагадувань їх буде відображено тут."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "Вибрано: %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Досягнуто максимальної кількості зображень (%d)."
 
@@ -331,3 +334,6 @@ msgstr "Запис скасовано. Запис закороткий."
 msgid "IDS_MEMO_SK_OK"
 msgstr "ОК"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Вибрати нагадування"
+

diff --git a/memo-app/res/po/uz.po b/memo-app/res/po/uz.po
index bc79049508e4a8471fa1bb09d1bc5f6d5a5806ea..7d378a51aec79857aa7f3d785d31111984309731 100644 (file)
--- a/memo-app/res/po/uz.po
+++ b/memo-app/res/po/uz.po
@@ -298,6 +298,9 @@ msgstr "O'chirish"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "Yozuvlarni yaratganingizdan so‘ng, ular bu yerda ko‘rsatiladi."
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%dta tanlandi"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "Tasvirlar soni maksimal miqdorga (%d) yetdi."
 
@@ -331,3 +334,6 @@ msgstr "Yozish bekor qilindi. Yozuv juda qisqa."
 msgid "IDS_MEMO_SK_OK"
 msgstr "OK"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "Yozuv tanlash"
+

diff --git a/memo-app/res/po/zh_CN.po b/memo-app/res/po/zh_CN.po
index 10a9a6798593ff988d19582d629a9d0ea6d22b65..84a3dd24887278e34517766db58d7784415a9504 100644 (file)
--- a/memo-app/res/po/zh_CN.po
+++ b/memo-app/res/po/zh_CN.po
@@ -298,6 +298,9 @@ msgstr "删除"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "在您创建备忘录后，其将显示在此处。"
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "已选择 %d"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "已达到最大图片数 (%d)"
 
@@ -331,3 +334,6 @@ msgstr "录制已取消。录制时间过短。"
 msgid "IDS_MEMO_SK_OK"
 msgstr "确定"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "选择备忘录"
+

diff --git a/memo-app/res/po/zh_HK.po b/memo-app/res/po/zh_HK.po
index 13d725efb49eb137314b21f6fbb55a1f2c5e8734..34b9d810e08d170d126bbb5ca12d790ae9655004 100644 (file)
--- a/memo-app/res/po/zh_HK.po
+++ b/memo-app/res/po/zh_HK.po
@@ -298,6 +298,9 @@ msgstr "刪除"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "在您建立備忘錄後，將顯示於此。"
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d 已選擇"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "已達圖像數量上限 (%d)。"
 
@@ -331,3 +334,6 @@ msgstr "錄製已取消。錄製長度過短。"
 msgid "IDS_MEMO_SK_OK"
 msgstr "確定"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "選擇備忘錄"
+

diff --git a/memo-app/res/po/zh_TW.po b/memo-app/res/po/zh_TW.po
index fff5c02a86fc9af1122170319d62686ec96bd104..ca339a778f83a4f6c32d40aa54094e62278b1746 100644 (file)
--- a/memo-app/res/po/zh_TW.po
+++ b/memo-app/res/po/zh_TW.po
@@ -298,6 +298,9 @@ msgstr "刪除"
 msgid "IDS_MEMO_BODY_AFTER_YOU_CREATE_MEMOS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "建立備忘錄後，將顯示於此。"
 
+msgid "IDS_MEMO_HEADER_PD_SELECTED_ABB2"
+msgstr "%d 已選擇"
+
 msgid "IDS_MEMO_TPOP_MAXIMUM_NUMBER_OF_IMAGES_HPD_REACHED"
 msgstr "已達圖像數量上限 (%d)。"
 
@@ -331,3 +334,6 @@ msgstr "錄音已取消。錄音過短。"
 msgid "IDS_MEMO_SK_OK"
 msgstr "確定"
 
+msgid "IDS_MEMO_HEADER_SELECT_MEMO_ABB"
+msgstr "選擇備忘錄"
+

diff --git a/memo-app/src/List/MemoListView.cpp b/memo-app/src/List/MemoListView.cpp
index 38bcca14a4713efde6d27eec85be9cfcc494fb86..ea82a706115110293085c253088e4437a253104f 100644 (file)
--- a/memo-app/src/List/MemoListView.cpp
+++ b/memo-app/src/List/MemoListView.cpp
@@ -18,8 +18,6 @@
 #include "List/MemoComparator.h"
 #include "List/MemoSearchItem.h"
 #include "List/SearchBar.h"
-
-#include "Input/InputView.h"
 #include "Input/DetailsView.h"
 
 #include "App/Path.h"
@@ -28,15 +26,8 @@
 #include "Ui/Menu.h"
 #include "Ui/Navigator.h"
 #include "Utils/Callback.h"
-#include "Utils/Logger.h"
-#include "Ux/SelectAllItem.h"
-
-#include "Common/Model/Memo.h"
-#include "Common/Strings.h"
-#include "Model/SearchData.h"
 
 #include <efl_extension.h>
-#include <functional>
 
 #include "ListLayout.h"
 #include "MemoItemLayout.h"
@@ -47,25 +38,31 @@
 #define GRID_COLS_L 3
 #define GRID_ROWS_L 2
 
-using namespace List;
-using namespace Input;
 using namespace Common::Model;
+using namespace Input;
+using namespace List;
 using namespace Model;
-using namespace Ui;
 using namespace Ux;
 
 using namespace std::placeholders;
 
 MemoListView::MemoListView()
-       : m_SearchProvider(m_DataProvider, MemoComparator())
-       , m_AlignLayout(nullptr)
-       , m_Bg(nullptr)
-       , m_AddButton(nullptr)
-       , m_SearchBar(nullptr)
-       , m_GenGrid(nullptr)
-       , m_SearchMode(false)
+       : m_Bg(nullptr), m_Content(nullptr), m_Gengrid(nullptr),
+         m_SearchBar(nullptr), m_AddButton(nullptr),
+         m_IsSearching(false),
+         m_SearchProvider(m_DataProvider, MemoComparator())
 {
-       setStrings(Common::getSelectViewStrings());
+       setStrings({
+               "IDS_MEMO_HEADER_SELECT_ALL_ABB3",
+               "IDS_TPLATFORM_ACBUTTON_DELETE_ABB",
+               "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB",
+               "IDS_MEMO_BODY_MEMO",
+               "IDS_MEMO_HEADER_SELECT_MEMO_ABB",
+               "IDS_MEMO_HEADER_SELECT_MEMOS_ABB",
+               "IDS_MEMO_HEADER_PD_SELECTED_ABB2",
+               "%zu/%zu",
+               ""
+       });
 }
 
 Evas_Object *MemoListView::onCreate(Evas_Object *parent)
@@ -78,24 +75,28 @@ Evas_Object *MemoListView::onCreate(Evas_Object *parent)
        m_Bg = elm_bg_add(layout);
        elm_object_part_content_set(layout, "elm.swallow.bg", m_Bg);
 
-       m_AlignLayout = elm_layout_add(layout);
-       elm_layout_file_set(m_AlignLayout, App::getResourcePath(LIST_LAYOUT_PATH).c_str(), LIST_LAYOUT);
-
-       m_GenGrid = createGrid(m_AlignLayout);
-       elm_object_part_content_set(m_AlignLayout, PART_CONTENT, m_GenGrid->getEvasObject());
-
+       m_Content = createContent(layout);
        m_AddButton = createAddButton(layout);
        return layout;
 }
 
 void MemoListView::onCreated()
 {
-       m_SearchProvider.initialize(std::bind(&MemoListView::onMemoListReceived, this));
        m_SearchProvider.setInsertCallback(std::bind(&MemoListView::onMemoInserted, this, _1));
+       m_SearchProvider.setUpdateFinishCallback(std::bind(&MemoListView::updateEmptyState, this));
+       m_SearchProvider.initialize([this] {
+               for (auto &dataItem : m_SearchProvider.getDataList()) {
+                       MemoSearchItem *memoItem = createItem(*dataItem);
+                       addSelectItem(memoItem);
+                       insertItem(memoItem);
+               }
+
+               updateEmptyState();
+       });
        updateAddButton();
 }
 
-void MemoListView::onPageAttached(NavigatorPage *page)
+void MemoListView::onPageAttached(Ui::NavigatorPage *page)
 {
        updateTitle();
        SelectView::onPageAttached(page);
@@ -103,8 +104,8 @@ void MemoListView::onPageAttached(NavigatorPage *page)
 
 void MemoListView::onMenuPressed()
 {
-       if (!isEmpty() && getSelectMode() != SelectMulti && !m_SearchMode) {
-               Menu *menu = new Menu();
+       if (!isEmpty() && getSelectMode() != SelectMulti && !m_IsSearching) {
+               auto menu = new Ui::Menu();
                menu->create(getEvasObject());
                if (getSelectMode() == SelectNone) {
                        menu->addItem("IDS_MEMO_OPT_DELETE", std::bind(&MemoListView::onDeleteSelected, this));
@@ -116,7 +117,7 @@ void MemoListView::onMenuPressed()
 
 bool MemoListView::onBackPressed()
 {
-       if (m_SearchMode) {
+       if (m_IsSearching) {
                onSearchFinished();
                return false;
        }
@@ -127,27 +128,27 @@ bool MemoListView::onBackPressed()
 void MemoListView::onRotationChanged(int degree)
 {
        if (degree == 0 || degree == 180) {
-               m_GenGrid->setSize(GRID_COLS_P, GRID_ROWS_P);
+               m_Gengrid->setSize(GRID_COLS_P, GRID_ROWS_P);
                elm_bg_file_set(m_Bg, App::getResourcePath(LIST_BG_P_PATH).c_str(), nullptr);
        } else {
-               m_GenGrid->setSize(GRID_COLS_L, GRID_ROWS_L);
+               m_Gengrid->setSize(GRID_COLS_L, GRID_ROWS_L);
                elm_bg_file_set(m_Bg, App::getResourcePath(LIST_BG_L_PATH).c_str(), nullptr);
        }
 }
 
 void MemoListView::onTitleChanged(const char *title)
 {
-       elm_object_translatable_part_text_set(m_AlignLayout, "text.title", title);
+       elm_object_translatable_part_text_set(m_Content, "text.title", title);
        SelectView::onTitleChanged(title);
 }
 
-void MemoListView::onSelectAllInsert(GenItem *item)
+void MemoListView::onSelectAllInsert(Ui::GenItem *item)
 {
-       Genlist *genlist = new Genlist();
-       genlist->create(m_AlignLayout);
+       auto genlist = new Ui::Genlist();
+       genlist->create(m_Content);
        genlist->insert(item);
        elm_scroller_content_min_limit(genlist->getEvasObject(), EINA_FALSE, EINA_TRUE);
-       elm_object_part_content_set(m_AlignLayout, PART_SELECT_ALL_ITEM, genlist->getEvasObject());
+       elm_object_part_content_set(m_Content, PART_SELECT_ALL_ITEM, genlist->getEvasObject());
 
        evas_object_event_callback_add(genlist->getEvasObject(), EVAS_CALLBACK_RESIZE,
                [](void *data, Evas *, Evas_Object *obj, void *) {
@@ -155,19 +156,19 @@ void MemoListView::onSelectAllInsert(GenItem *item)
                        evas_object_geometry_get(obj, nullptr, nullptr, nullptr, &h);
 
                        auto view = (MemoListView *) data;
-                       view->m_GenGrid->setSizeAdjustment(0, h);
+                       view->m_Gengrid->setSizeAdjustment(0, h);
                }, this);
        evas_object_event_callback_add(genlist->getEvasObject(), EVAS_CALLBACK_DEL,
                [](void *data, Evas *, Evas_Object *, void *) {
                        auto view = (MemoListView *) data;
-                       view->m_GenGrid->setSizeAdjustment(0, 0);
+                       view->m_Gengrid->setSizeAdjustment(0, 0);
                }, this);
 }
 
 void MemoListView::onSelectModeChanged(SelectMode selectMode)
 {
        if (selectMode == SelectNone) {
-               elm_object_part_content_set(m_AlignLayout, PART_SELECT_ALL_ITEM, nullptr);
+               elm_object_part_content_set(m_Content, PART_SELECT_ALL_ITEM, nullptr);
        }
 
        updateAddButton();
@@ -176,60 +177,71 @@ void MemoListView::onSelectModeChanged(SelectMode selectMode)
 
 void MemoListView::onDeleteSelected()
 {
-       setCancelCallback([this]() {
-               onSelectFinished();
+       setCancelCallback([this] {
+               onDeleteFinished();
                return false;
        });
 
        setSelectCallback([this](SelectResults results) {
                for (auto &&result : results) {
-                       m_DataProvider.deleteMemo((Memo*)result.value.data);
+                       m_DataProvider.deleteMemo((Memo *) result.value.data);
                }
 
-               onSelectFinished();
+               onDeleteFinished();
                return false;
        });
 
        setSelectMode(SelectMulti);
 }
 
-void MemoListView::onSearchSelected()
+void MemoListView::onDeleteFinished()
 {
-       onSearchStarted();
+       setSelectMode(SelectNone);
+       setCancelCallback(nullptr);
+       setSelectCallback(nullptr);
 }
 
-Gengrid *MemoListView::createGrid(Evas_Object *parent)
+void MemoListView::onSearchSelected()
 {
-       Gengrid *memoGrid = new Gengrid();
-       memoGrid->create(parent);
-       elm_gengrid_align_set(memoGrid->getEvasObject(), 0.0, 0.0);
+       m_IsSearching = true;
+       getPage()->setStyle("empty");
+       getPage()->setContent("title", createSearchBar(getEvasObject()));
+       updateAddButton();
+       updateTitle();
+}
 
-       Evas_Object *edje = elm_layout_edje_get(memoGrid->getEvasObject());
-       edje_object_color_class_set(edje, "gengrid/default/bg", 250, 250, 250, 0, 0,0,0,0,0,0,0,0);
+void MemoListView::onSearchFinished()
+{
+       delete m_SearchBar;
+       m_SearchBar = nullptr;
 
-       return memoGrid;
+       m_SearchProvider.search("");
+       m_IsSearching = false;
+       getPage()->setStyle("basic");
+       updateAddButton();
+       updateTitle();
 }
 
-Evas_Object *MemoListView::createAddButton(Evas_Object *parent)
+Evas_Object *MemoListView::createContent(Evas_Object *parent)
 {
-       Evas_Object *floatButton = eext_floatingbutton_add(parent);
-       Evas_Object *button = elm_button_add(floatButton);
-       elm_object_part_content_set(floatButton, "button1", button);
-       evas_object_smart_callback_add(button, "clicked",
-                       makeCallback(&MemoListView::onAddPressed), this);
+       Evas_Object *layout = elm_layout_add(parent);
+       elm_layout_file_set(layout, App::getResourcePath(LIST_LAYOUT_PATH).c_str(), LIST_LAYOUT);
 
-       Evas_Object *image = elm_image_add(button);
-       elm_image_file_set(image, App::getResourcePath(LIST_ADD_BUTTON_ICON_PATH).c_str(), nullptr);
-       elm_object_part_content_set(button, "icon", image);
+       m_Gengrid = new Ui::Gengrid();
+       m_Gengrid->create(layout);
+       elm_gengrid_align_set(m_Gengrid->getEvasObject(), 0.0, 0.0);
+       edje_object_color_class_set(elm_layout_edje_get(m_Gengrid->getEvasObject()),
+                       "gengrid/default/bg", 250, 250, 250, 0, 0 ,0, 0, 0, 0, 0, 0, 0);
+       elm_object_part_content_set(layout, PART_CONTENT, m_Gengrid->getEvasObject());
 
-       return floatButton;
+       return layout;
 }
 
 Evas_Object *MemoListView::createNoContent(Evas_Object *parent)
 {
        Evas_Object *layout = elm_layout_add(parent);
        elm_layout_theme_set(layout, "layout", "nocontents", "default");
-       if (m_SearchMode) {
+       if (m_IsSearching) {
                elm_object_translatable_part_text_set(layout, "elm.text", "IDS_MEMO_NPBODY_NO_RESULTS_FOUND");
        } else {
                elm_object_translatable_part_text_set(layout, "elm.text", "IDS_MEMO_NPBODY_NO_MEMOS");
@@ -239,13 +251,40 @@ Evas_Object *MemoListView::createNoContent(Evas_Object *parent)
        return layout;
 }
 
+Evas_Object *MemoListView::createSearchBar(Evas_Object *parent)
+{
+       m_SearchBar = new SearchBar();
+       m_SearchBar->create(getEvasObject());
+       m_SearchBar->setBackCallback(std::bind(&MemoListView::onSearchFinished, this));
+       m_SearchBar->setChangeCallback([this](const char *text) {
+               m_SearchProvider.search(text);
+       });
+       return m_SearchBar->getEvasObject();
+}
+
+Evas_Object *MemoListView::createAddButton(Evas_Object *parent)
+{
+       Evas_Object *floatButton = eext_floatingbutton_add(parent);
+       Evas_Object *button = elm_button_add(floatButton);
+       elm_object_part_content_set(floatButton, "button1", button);
+       evas_object_smart_callback_add(button, "clicked", [](void *data, Evas_Object *, void *) {
+               auto view = (MemoListView *) data;
+               view->getNavigator()->navigateTo(new Input::InputView(Memo(), &view->m_DataProvider));
+       }, this);
+
+       Evas_Object *image = elm_image_add(button);
+       elm_image_file_set(image, App::getResourcePath(LIST_ADD_BUTTON_ICON_PATH).c_str(), nullptr);
+       elm_object_part_content_set(button, "icon", image);
+
+       return floatButton;
+}
+
 void MemoListView::updateAddButton()
 {
-       if (!m_SearchMode && getSelectMode() == Ux::SelectNone) {
+       if (!m_IsSearching && getSelectMode() == Ux::SelectNone) {
                elm_object_part_content_set(getEvasObject(), "elm.swallow.floatingbutton", m_AddButton);
        } else {
-               elm_object_part_content_unset(getEvasObject(), "elm.swallow.floatingbutton");
-               evas_object_hide(m_AddButton);
+               evas_object_hide(elm_object_part_content_unset(getEvasObject(), "elm.swallow.floatingbutton"));
        }
 }
 
@@ -253,72 +292,47 @@ void MemoListView::updateEmptyState()
 {
        if (isEmpty()) {
                Evas_Object *content = elm_object_part_content_unset(getEvasObject(), "elm.swallow.content");
-               if (content == m_AlignLayout) {
+               if (content == m_Content) {
                        evas_object_hide(content);
                } else {
                        evas_object_del(content);
                }
                elm_object_part_content_set(getEvasObject(), "elm.swallow.content", createNoContent(getEvasObject()));
        } else {
-               elm_object_part_content_set(getEvasObject(), "elm.swallow.content", m_AlignLayout);
+               elm_object_part_content_set(getEvasObject(), "elm.swallow.content", m_Content);
        }
        updateTitle();
 }
 
 void MemoListView::updateTitle()
 {
-       if (getSelectMode() == SelectMulti || m_SearchMode || isEmpty()) {
-               elm_object_signal_emit(m_AlignLayout, SIGNAL_TITLE_HIDE, "*");
+       if (getSelectMode() == SelectMulti || m_IsSearching || isEmpty()) {
+               elm_object_signal_emit(m_Content, SIGNAL_TITLE_HIDE, "*");
                getPage()->setTitleVisibility(true);
        } else {
                getPage()->setTitleVisibility(false);
-               elm_object_signal_emit(m_AlignLayout, SIGNAL_TITLE_SHOW, "*");
+               elm_object_signal_emit(m_Content, SIGNAL_TITLE_SHOW, "*");
        }
 }
 
-void MemoListView::onAddPressed(Evas_Object *button, void *eventInfo)
-{
-       Memo memo;
-       getNavigator()->navigateTo(new Input::InputView(std::move(memo), &m_DataProvider));
-}
-
-void MemoListView::onMemoListReceived()
-{
-       for (auto &dataItem : m_SearchProvider.getDataList()) {
-               MemoSearchItem *memoItem = createItem(*dataItem);
-               addSelectItem(memoItem);
-               insertItem(memoItem);
-       }
-
-       updateEmptyState();
-}
-
 void MemoListView::onSearchResultChanged(MemoSearchItem *item, const SearchResult *result)
 {
-       if (!m_SearchMode) {
+       bool isMatching = result || !m_SearchBar || elm_entry_is_empty(m_SearchBar->getEntry());
+       if (item->isInserted() == isMatching) {
+               item->updateSearchResult();
                return;
        }
-       item->setSearchResult(result);
 
-       const char *searchText = (m_SearchBar) ? elm_entry_entry_get(m_SearchBar->getEntry()) : "";
-       bool shouldBeInserted = (result || !*searchText);
-
-       if (item->isInserted() == shouldBeInserted) {
-               return;
-       }
-
-       if (shouldBeInserted) {
+       if (isMatching) {
                insertItem(item);
        } else {
                item->pop();
        }
-
-       updateEmptyState();
 }
 
 void MemoListView::onMemoUpdated(MemoSearchItem *memoItem, int changes)
 {
-       if (!m_SearchMode || memoItem->getSearchResult()) {
+       if (!m_IsSearching || memoItem->getSearchResult()) {
                insertItem(memoItem);
        }
 }
@@ -327,76 +341,33 @@ void MemoListView::onMemoDeleted(MemoSearchItem *memoItem)
 {
        removeSelectItem(memoItem);
        delete memoItem;
-
-       updateEmptyState();
 }
 
-void MemoListView::onMemoInserted(DataItem &item)
+void MemoListView::onMemoInserted(DataItem &dataItem)
 {
-       auto memoItem = createItem(item);
+       MemoSearchItem *memoItem = createItem(dataItem);
        addSelectItem(memoItem);
 
-       if (!m_SearchMode || memoItem->getSearchResult()) {
+       if (!m_IsSearching || memoItem->getSearchResult()) {
                insertItem(memoItem);
-               updateEmptyState();
        }
 }
 
-void MemoListView::onSelectFinished()
-{
-       setSelectMode(SelectNone);
-       setCancelCallback(nullptr);
-       setSelectCallback(nullptr);
-}
-
-void MemoListView::onSearchStarted()
+MemoSearchItem *MemoListView::createItem(DataItem &dataItem)
 {
-       m_SearchMode = true;
-       m_SearchBar = new SearchBar();
-       m_SearchBar->create(getEvasObject());
-       m_SearchBar->setBackCallback(std::bind(&MemoListView::onSearchFinished, this));
-       m_SearchBar->setChangeCallback(std::bind(&MemoListView::onSearchChanged, this, _1));
-
-       getPage()->setStyle("empty");
-       getPage()->setContent("title", m_SearchBar->getEvasObject());
-       updateAddButton();
-       updateTitle();
-}
-
-void MemoListView::onSearchChanged(const char *text)
-{
-       m_SearchProvider.search(text);
-}
-
-void MemoListView::onSearchFinished()
-{
-       delete m_SearchBar;
-       m_SearchBar = nullptr;
-       m_SearchProvider.search("");
-
-       m_SearchMode = false;
-       getPage()->setStyle("basic");
-       updateAddButton();
-       updateTitle();
-}
-
-MemoSearchItem *MemoListView::createItem(DataItem &item)
-{
-       SearchData &searchData = static_cast<SearchData &>(item);
-       Memo &memo = (Memo &)searchData.getDataItem();
+       auto &searchData = static_cast<SearchData &>(dataItem);
+       auto &memo = static_cast<Memo &>(searchData.getDataItem());
 
        auto memoItem = new MemoSearchItem(searchData);
-
-       searchData.setChangeCallback(std::bind(&MemoListView::onSearchResultChanged, this, memoItem, _1));
-       searchData.setUpdateCallback(std::bind(&MemoListView::onMemoUpdated, this, memoItem, _1));
-       searchData.setDeleteCallback(std::bind(&MemoListView::onMemoDeleted, this, memoItem));
-
-       memoItem->setSelectCallback([this, &memo]() {
+       memoItem->setSelectCallback([this, &memo] {
                if (getSelectMode() == SelectNone) {
                        getNavigator()->navigateTo(new Input::DetailsView(memo, &m_DataProvider));
                }
        });
 
+       searchData.setChangeCallback(std::bind(&MemoListView::onSearchResultChanged, this, memoItem, _1));
+       searchData.setUpdateCallback(std::bind(&MemoListView::onMemoUpdated, this, memoItem, _1));
+       searchData.setDeleteCallback(std::bind(&MemoListView::onMemoDeleted, this, memoItem));
        return memoItem;
 }
 
@@ -405,17 +376,17 @@ void MemoListView::insertItem(MemoSearchItem *memoItem)
        if (memoItem->isInserted()) {
                memoItem->pop();
        }
-       GenItem *nextItem = nullptr;
-       for (auto &&item : *m_GenGrid) {
+       Ui::GenItem *nextItem = nullptr;
+       for (auto &&item : *m_Gengrid) {
                if (*static_cast<MemoSearchItem *>(item) < *memoItem) {
                        nextItem = item;
                        break;
                }
        }
-       m_GenGrid->insert(memoItem, nextItem);
+       m_Gengrid->insert(memoItem, nextItem);
 }
 
 bool MemoListView::isEmpty() const
 {
-       return m_GenGrid->getFirstItem() == nullptr;
+       return m_Gengrid->getFirstItem() == nullptr;
 }

diff --git a/memo-app/src/List/MemoSearchItem.cpp b/memo-app/src/List/MemoSearchItem.cpp
index 230196ef7d12e66e01653103117727179a582f18..f75ebce8e347f0f0e6dea3f1ebf6975177d7cbaf 100644 (file)
--- a/memo-app/src/List/MemoSearchItem.cpp
+++ b/memo-app/src/List/MemoSearchItem.cpp
@@ -26,28 +26,26 @@ using namespace Model;
 
 MemoSearchItem::MemoSearchItem(SearchData &data)
        : MemoItem(static_cast<Memo &>(data.getDataItem())),
-         m_SearchData(data), m_Highlight(false)
+         m_SearchData(data)
 {
 }
 
-void MemoSearchItem::setSearchResult(const SearchResult *result)
+void MemoSearchItem::updateSearchResult()
 {
-       m_Highlight = result != nullptr;
        update(PART_TITLE, ELM_GENGRID_ITEM_FIELD_TEXT);
        update(PART_CONTENT, ELM_GENGRID_ITEM_FIELD_CONTENT);
 }
 
-const SearchResult *MemoSearchItem::getSearchResult() const
+const SearchMultiResult *MemoSearchItem::getSearchResult() const
 {
-       return m_SearchData.getSearchResult();
+       return static_cast<const SearchMultiResult *>(m_SearchData.getSearchResult());
 }
 
 char *MemoSearchItem::getText(Evas_Object *parent, const char *part)
 {
-       if (m_Highlight) {
+       if (auto result = getSearchResult()) {
                if (strcmp(part, PART_TITLE) == 0) {
-                       auto multiResult = static_cast<const SearchMultiResult *>(m_SearchData.getSearchResult());
-                       if (auto match = multiResult->getMatchByFieldId(Memo::FieldTitle)) {
+                       if (auto match = result->getMatchByFieldId(Memo::FieldTitle)) {
                                return strdup(Utils::highlightStr(getMemo().getTitle().c_str(), match->substr).c_str());
                        }
                }
@@ -58,9 +56,8 @@ char *MemoSearchItem::getText(Evas_Object *parent, const char *part)
 
 std::string MemoSearchItem::formatSubitem(size_t index, std::string text) const
 {
-       if (m_Highlight) {
-               auto multiResult = static_cast<const SearchMultiResult *>(m_SearchData.getSearchResult());
-               if (auto match = multiResult->getMatchByFieldId(Memo::FieldContent)) {
+       if (auto result = getSearchResult()) {
+               if (auto match = result->getMatchByFieldId(Memo::FieldContent)) {
                        if (match->subItemIndex == index) {
                                return Utils::highlightStr(text.c_str(), match->substr);
                        }