OSDN Git Service

Merge Hiroshi's changes.
authorRandy Baumgarte <randy@fbn.cx>
Fri, 1 Oct 2010 16:39:08 +0000 (12:39 -0400)
committerRandy Baumgarte <randy@fbn.cx>
Fri, 1 Oct 2010 16:44:47 +0000 (12:44 -0400)
27 files changed:
build.xml
nevernote.pro
src/cx/fbn/nevernote/Global.java
src/cx/fbn/nevernote/NeverNote.java
src/cx/fbn/nevernote/config/FileManager.java
src/cx/fbn/nevernote/filters/AttributeFilter.java
src/cx/fbn/nevernote/filters/ContainsAttributeFilter.java
src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java [new file with mode: 0644]
src/cx/fbn/nevernote/filters/DateAttributeFilter.java
src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java [new file with mode: 0644]
src/cx/fbn/nevernote/gui/AttributeTreeWidget.java
src/cx/fbn/nevernote/gui/ContainsAttributeFilterTable.java
src/cx/fbn/nevernote/gui/DateAttributeFilterTable.java
src/cx/fbn/nevernote/gui/TableView.java
src/cx/fbn/nevernote/gui/TagTreeWidget.java
translations/nevernote_ca.ts
translations/nevernote_da.ts
translations/nevernote_de.ts
translations/nevernote_es.ts
translations/nevernote_fr.ts
translations/nevernote_ja.ts
translations/nevernote_pl.ts
translations/nevernote_pt.ts
translations/nevernote_ru.ts
translations/nevernote_sk.ts
translations/nevernote_zh_CN.ts
translations/nevernote_zh_TW.ts

index b3d722f..f2ceeba 100644 (file)
--- a/build.xml
+++ b/build.xml
       <pathelement location="${lib.dir}/log4j-1.2.14.jar"/>
       <pathelement location="${lib.dir}/h2-1.2.136.jar"/>
       <pathelement location="${lib.dir}/commons-lang-2.4.jar"/>
+      <pathelement location="${lib.dir}/jtidy-r938.jar"/>
       <!-- dependent library -->
       <pathelement location="${qtlib.dir}/qtjambi-${qtjambi.ver}.jar"/>
       <pathelement location="${qtlib.dir}/qtjambi-${qtjambi.platform}-${qtjambi.ver}.jar"/>
index 9733770..dd1584f 100644 (file)
@@ -15,8 +15,9 @@ SOURCES         =  \
     src/cx/fbn/nevernote/filters/NoteSortFilterProxyModel.java \
     src/cx/fbn/nevernote/filters/NotebookCounter.java \
     src/cx/fbn/nevernote/filters/TagCounter.java \
-    src/cx/fbn/nevernote/filters/AttributeFilter.java \
-    src/cx/fbn/nevernote/filters/DateAttributeFilter.java \
+    src/cx/fbn/nevernote/filters/AttributeFilterFactory.java \
+    src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java \
+    src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java \
     src/cx/fbn/nevernote/filters/EnSearch.java \
     src/cx/fbn/nevernote/filters/WordFilter.java \
     src/cx/fbn/nevernote/evernote/EnCrypt.java \
index 8a082dc..e273a16 100644 (file)
@@ -46,7 +46,7 @@ import cx.fbn.nevernote.gui.ShortcutKeys;
 import cx.fbn.nevernote.utilities.ApplicationLogger;\r
 \r
 public class Global {\r
-       public static String version = "0.90";\r
+       public static String version = "0.90-20100930";\r
     public static String username = ""; \r
     public static String password = "";     \r
     \r
index 1a9f370..57d894c 100644 (file)
@@ -323,12 +323,8 @@ public class NeverNote extends QMainWindow{
                
                logger.log(logger.EXTREME, "Starting GUI build");
 
-               QTranslator qtTranslator = new QTranslator();
-               qtTranslator.load("classpath:/translations/qt_" + QLocale.system().name() + ".qm");
-               QApplication.instance().installTranslator(qtTranslator);
-
                QTranslator nevernoteTranslator = new QTranslator();
-               nevernoteTranslator.load("classpath:/translations/nevernote_"+QLocale.system().name()+ ".qm");
+               nevernoteTranslator.load(Global.getFileManager().getTranslateFilePath("nevernote_" + QLocale.system().name() + ".qm"));
                QApplication.instance().installTranslator(nevernoteTranslator);
 
                Global.originalPalette = QApplication.palette();
@@ -3250,6 +3246,7 @@ public class NeverNote extends QMainWindow{
        private void fullReindex() {
        logger.log(logger.HIGH, "Entering NeverNote.fullReindex");
        // If we are deleting non-trash notes
+       if (currentNote == null) return;
        if (currentNote.getDeleted() == 0) { 
                if (QMessageBox.question(this, tr("Confirmation"), tr("This will cause all notes & attachments to be reindexed, "+
                                "but please be aware that depending upon the size of your database updating all these records " +
index b444d71..cff1b21 100644 (file)
@@ -38,6 +38,9 @@ public class FileManager {
 
     private final File xmlDir;
 
+    private final String translateDirPath;
+    private final File translateDir;
+
     /**
      * Check or create the db, log and res directories.
      *
@@ -74,6 +77,10 @@ public class FileManager {
         xmlDir = new File(programDir, "xml");
         checkExistingReadableDir(xmlDir);
 
+        translateDir = new File(programDir, "translate");
+        checkExistingReadableDir(translateDir);
+        translateDirPath= slashTerminatePath(translateDir.getPath());
+
         // Read-write
         dbDir = new File(homeDir, "db");
         createDirOrCheckWriteable(dbDir);
@@ -207,6 +214,14 @@ public class FileManager {
         return new File(xmlDir, toPlatformPathSeparator(relativePath));
     }
 
+    /**
+     * Get a path below the 'translate' directory, using native {@link File#separator}.
+     * This will contain backslashes on Windows.
+     */
+    public String getTranslateFilePath(String relativePath) {
+        return translateDirPath + toPlatformPathSeparator(relativePath);
+    }
+
     private static String toPlatformPathSeparator(String relativePath) {
        // Sometimes a space in the file name comes across as a %20.  This is to put it back as a space.
        relativePath = relativePath.replace("%20", " ");
index 35557ff..97ff31f 100644 (file)
 */\r
 \r
 package cx.fbn.nevernote.filters;\r
+import com.evernote.edam.type.Note;\r
 \r
-\r
-public class AttributeFilter {\r
-       private final String name;\r
+public abstract class AttributeFilter {\r
        private boolean set;\r
        public AttributeFilter() {\r
-               name = "";\r
-               set = false;\r
-       }\r
-       public AttributeFilter(String n) {\r
-               name = n;\r
                set = false;\r
        }\r
        public void set(boolean b) {\r
@@ -36,8 +30,7 @@ public class AttributeFilter {
        }\r
        public boolean isSet() {\r
                return  set;\r
-       }\r
-       public String getName() {\r
-               return  name;\r
-       }\r
+    }\r
+    public abstract boolean attributeCheck(Note n);\r
+    public abstract String getLabel();\r
 }\r
index 9d39da1..5403e3a 100644 (file)
@@ -1,6 +1,7 @@
 /*\r
  * This file is part of NeverNote \r
- * Copyright 2009 Randy Baumgarte\r
+ * Copyright 2009,2010 Randy Baumgarte\r
+ * Copyright 2010 Hiroshi Miura\r
  * \r
  * This file may be licensed under the terms of of the\r
  * GNU General Public License Version 2 (the ``GPL'').\r
@@ -25,70 +26,13 @@ import cx.fbn.nevernote.filters.AttributeFilter;
 \r
 \r
 public abstract class ContainsAttributeFilter extends AttributeFilter {\r
+       protected String label;\r
        public ContainsAttributeFilter(String n) {\r
-               super(n);\r
+               super();\r
+               label=n;\r
        }\r
-       public abstract boolean checkContent(Note n);\r
-\r
-       public static class Mime extends ContainsAttributeFilter {\r
-               private String _mime;\r
-               public Mime(String n, String m) {\r
-                       super(n);\r
-                       _mime = m; \r
-               }\r
-               public boolean checkContent(Note n) {\r
-                       for (int i=0; i<n.getResourcesSize(); i++) {\r
-                               if (n.getResources().get(i).getMime().startsWith(_mime))\r
-                                       return true;\r
-                       }\r
-                       return false;\r
-               }\r
-       }\r
-       public static class Attachment extends ContainsAttributeFilter {\r
-               public Attachment(String n) {\r
-                       super(n);\r
-               }\r
-               public boolean checkContent(Note n) {\r
-                       for (int i=0; i<n.getResourcesSize(); i++) {\r
-                               if (n.getResources().get(i).getAttributes() != null \r
-                                       && n.getResources().get(i).getAttributes().isAttachment())\r
-                                       return true;\r
-                       }\r
-                       return false;\r
-               }\r
-       }\r
-       public static class Todo extends ContainsAttributeFilter {\r
-               private boolean _checked;\r
-               public Todo(String n, boolean checked) {\r
-                       super(n);\r
-                       _checked = checked;\r
-               }\r
-               public boolean checkContent(Note n) {\r
-                       String content = n.getContent();\r
-                       int pos = content.indexOf("<en-todo");\r
-                       for (; pos >=0 ; pos=content.indexOf("<en-todo", pos+1)) {\r
-                                       int endPos = content.indexOf("/>", pos);\r
-                                       String segment = content.substring(pos, endPos);\r
-                                       boolean currentState = false;\r
-                                       if (segment.indexOf("checked=\"true\"") > -1)\r
-                                        currentState = true;\r
-                                       if (currentState == _checked)\r
-                                       return true;\r
-                       }\r
-                       return false;\r
-               }\r
-       }\r
-       public static class Content extends ContainsAttributeFilter {\r
-               private String _text;\r
-               public Content(String n, String text) {\r
-                       super(n);\r
-                       _text = text;\r
-               }\r
-               public boolean checkContent(Note n) {\r
-                       if (n.getContent().indexOf(_text) > -1)\r
-                                return true;\r
-                       else\r
-                                return false;\r
-               }\r
+       public abstract boolean attributeCheck(Note n);\r
+       public String getLabel() {\r
+               return label;\r
        }\r
 }\r
diff --git a/src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java b/src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java
new file mode 100644 (file)
index 0000000..4971ec6
--- /dev/null
@@ -0,0 +1,133 @@
+/*\r
+ * This file is part of NeverNote \r
+ * Copyright 2009,2010 Randy Baumgarte\r
+ * Copyright 2010 Hiroshi Miura\r
+ * \r
+ * This file may be licensed under the terms of of the\r
+ * GNU General Public License Version 2 (the ``GPL'').\r
+ *\r
+ * Software distributed under the License is distributed\r
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either\r
+ * express or implied. See the GPL for the specific language\r
+ * governing rights and limitations.\r
+ *\r
+ * You should have received a copy of the GPL along with this\r
+ * program. If not, go to http://www.gnu.org/licenses/gpl.html\r
+ * or write to the Free Software Foundation, Inc.,\r
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r
+ *\r
+*/\r
+\r
+package cx.fbn.nevernote.filters;\r
+\r
+import com.trolltech.qt.core.QCoreApplication;\r
+import com.evernote.edam.type.Note;\r
+import cx.fbn.nevernote.filters.ContainsAttributeFilter;\r
+\r
+public class ContainsAttributeFilterFactory {\r
+       private ContainsAttributeFilterFactory() {\r
+       }\r
+       public static enum Contains {Images,Audio,Ink,EncryptedText,Todo,UnfinishedTodo,FinishedTodo,Attachment,PDF};\r
+\r
+       public static ContainsAttributeFilter create(Contains fType){\r
+        switch (fType) {\r
+        case Images:\r
+            return new ContainsAttributeFilterMime(QCoreApplication.translate("cx.fbn.nevernote.filters.ContainsAttributeFilter",\r
+                                                   "Images"),"image/");\r
+        case Audio:\r
+            return new ContainsAttributeFilterMime(QCoreApplication.translate("cx.fbn.nevernote.filters.ContainsAttributeFilter",\r
+                                                   "Audio"),"audio/");\r
+       case Ink:\r
+            return new ContainsAttributeFilterMime(QCoreApplication.translate("cx.fbn.nevernote.filters.ContainsAttributeFilter",\r
+                                                   "Ink"),"application/vnd.evernote.ink");\r
+        case EncryptedText:\r
+            return new ContainsAttributeFilterContent(QCoreApplication.translate("cx.fbn.nevernote.filters.ContainsAttributeFilter",\r
+                                                   "Encrypted Text"), "<en-crypt");\r
+        case Todo:\r
+            return new ContainsAttributeFilterContent(QCoreApplication.translate("cx.fbn.nevernote.filters.ContainsAttributeFilter",\r
+                                                   "ToDo Items"),"<en-todo");\r
+        case UnfinishedTodo:\r
+            return new ContainsAttributeFilterTodo(QCoreApplication.translate("cx.fbn.nevernote.filters.ContainsAttributeFilter",\r
+                                                   "Unfinished to-do items"),false);\r
+        case FinishedTodo:\r
+            return new ContainsAttributeFilterTodo(QCoreApplication.translate("cx.fbn.nevernote.filters.ContainsAttributeFilter",\r
+                                                   "Finished to-do items"), true);\r
+        case Attachment:\r
+            return new ContainsAttributeFilterAttachment(QCoreApplication.translate("cx.fbn.nevernote.filters.ContainsAttributeFilter",\r
+                                                   "Attachment"));\r
+        case PDF:\r
+            return new ContainsAttributeFilterMime(QCoreApplication.translate("cx.fbn.nevernote.filters.ContainsAttributeFilter",\r
+                                                   "PDF"),"application/pdf");\r
+               }\r
+        throw new IllegalArgumentException("The filter type " + fType + " is not recognized.");\r
+\r
+       }\r
+}\r
+\r
+// Contains filter strategies\r
+class ContainsAttributeFilterMime extends ContainsAttributeFilter {\r
+       private String _mime;\r
+       public ContainsAttributeFilterMime(String n, String m) {\r
+               super(n);\r
+               _mime = m; \r
+       }\r
+       public boolean attributeCheck(Note n) {\r
+        for (int i=0; i<n.getResourcesSize(); i++) {\r
+                   if (n.getResources().get(i).getMime().startsWith(_mime))\r
+                   return true;\r
+        }\r
+               return false;\r
+       }\r
+}\r
+\r
+class ContainsAttributeFilterContent extends ContainsAttributeFilter {\r
+       private String _text;\r
+       public ContainsAttributeFilterContent(String n, String text) {\r
+               super(n);\r
+               _text = text;\r
+       }\r
+       public boolean attributeCheck(Note n) {\r
+        if (n.getContent().indexOf(_text) > -1)\r
+            return true;\r
+        else\r
+            return false;\r
+    }\r
+}\r
+\r
+class ContainsAttributeFilterTodo extends ContainsAttributeFilter {\r
+       private boolean _checked;\r
+       public ContainsAttributeFilterTodo(String n, boolean checked) {\r
+               super(n);\r
+               _checked = checked;\r
+       }\r
+               public boolean attributeCheck(Note n) {\r
+                       String content = n.getContent();\r
+                       int pos = content.indexOf("<en-todo");\r
+                       for (; pos >=0 ; pos=content.indexOf("<en-todo", pos+1)) {\r
+                                       int endPos = content.indexOf("/>", pos);\r
+                                       String segment = content.substring(pos, endPos);\r
+                                       boolean currentState = false;\r
+                                       if (segment.indexOf("checked=\"true\"") > -1)\r
+                                        currentState = true;\r
+                                       if (currentState == _checked)\r
+                                       return true;\r
+                       }\r
+                       return false;\r
+               }\r
+}\r
+\r
+\r
+class ContainsAttributeFilterAttachment extends ContainsAttributeFilter {\r
+               public ContainsAttributeFilterAttachment(String n) {\r
+                       super(n);\r
+               }\r
+               public boolean attributeCheck(Note n) {\r
+                       for (int i=0; i<n.getResourcesSize(); i++) {\r
+                               if (n.getResources().get(i).getAttributes() != null \r
+                                       && n.getResources().get(i).getAttributes().isAttachment())\r
+                                       return true;\r
+                       }\r
+                       return false;\r
+               }\r
+       }\r
+\r
index c3efa6c..fdef3a8 100644 (file)
 \r
 package cx.fbn.nevernote.filters;\r
 \r
-import com.trolltech.qt.core.QCoreApplication;\r
+import java.text.SimpleDateFormat;\r
 import com.trolltech.qt.core.QDateTime;\r
 \r
+import com.evernote.edam.type.Note;\r
+\r
+import cx.fbn.nevernote.filters.AttributeFilter;\r
+\r
 public abstract class DateAttributeFilter extends AttributeFilter {\r
-       protected boolean checkSince;\r
-       public abstract boolean attributeCheck(QDateTime a, QDateTime b);\r
+    protected boolean checkSince;\r
+    private boolean checkCreated;\r
+\r
+    public DateAttributeFilter (boolean since, boolean created) {\r
+       super();\r
+       checkSince=since;\r
+       checkCreated=created;\r
+    }\r
+\r
+    public abstract boolean attributeCheck(Note n);\r
+\r
+    protected QDateTime noteTime(Note n) {\r
+        QDateTime noteDate;\r
+        String dateTimeFormat = new String("MM/dd/yyyy HH:mm:ss");\r
+        SimpleDateFormat simple = new SimpleDateFormat(dateTimeFormat);\r
 \r
-       public DateAttributeFilter() {\r
-               super();\r
-       }\r
-       public DateAttributeFilter(String n) {\r
-               super(n);\r
-       }\r
-       public abstract String getLabel();\r
-       \r
-       public static class checkToday extends DateAttributeFilter {\r
-               public checkToday(boolean since) {\r
-                   super();\r
-                       checkSince=since; \r
-               }\r
-               // Check if it was within the last day\r
-               @Override\r
-               public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
-                       if (checkSince)\r
-                               return noteDate.daysTo(current) == 0;\r
-                       else \r
-                               return noteDate.daysTo(current) > 0;\r
-               }\r
-               @Override\r
-               public String getLabel(){\r
-                       return QCoreApplication.translate("DateAttributeFilter", "Today");\r
-               }\r
-       }\r
-       public static class checkYesterday extends DateAttributeFilter {\r
-               public checkYesterday(boolean since) {\r
-                       super();\r
-                       checkSince=since; \r
-               }\r
-               // Check if it was within the last two days\r
-               @Override\r
-               public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
-               if (checkSince) \r
-                       return noteDate.daysTo(current) <= 1;\r
-               else\r
-                       return noteDate.daysTo(current) > 1;\r
-               }\r
-               @Override\r
-               public String getLabel(){\r
-                       return QCoreApplication.translate("DateAttributeFilter", "Yesterday");\r
-               }\r
-       }\r
-       public static class checkThisWeek extends DateAttributeFilter {\r
-               public checkThisWeek(boolean since) {\r
-                    super();\r
-                       checkSince=since; \r
-               }\r
-               // Check if it was within the last two days\r
-               @Override\r
-               public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
-                       if (checkSince) \r
-                               return noteDate.daysTo(current) <= 7;\r
-                       else\r
-                               return noteDate.daysTo(current) > 7;\r
-               }\r
-               @Override\r
-               public String getLabel(){\r
-                       return QCoreApplication.translate("DateAttributeFilter", "This Week");\r
-               }\r
-       }\r
-       public static class checkLastWeek extends DateAttributeFilter {\r
-               public checkLastWeek(boolean since) {\r
-                               super();\r
-                               checkSince=since; \r
-               }\r
-               // Check if it was within the last two weeks\r
-               @Override\r
-               public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
-                       if (checkSince) \r
-                               return noteDate.daysTo(current) <= 14;\r
-                       else\r
-                               return noteDate.daysTo(current) > 14;\r
-               }\r
-               @Override\r
-               public String getLabel(){\r
-                       return QCoreApplication.translate("DateAttributeFilter", "Last Week");\r
-               }\r
-       }\r
-       public static class checkMonth extends DateAttributeFilter {\r
-               public checkMonth(boolean since) {\r
-                       super();\r
-                       checkSince=since; \r
-               }\r
-               // Check if it was within the last month\r
-               @Override\r
-               public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
-                       if (checkSince) {\r
-                               if (noteDate.date().year() == current.date().year())\r
-                                       return noteDate.date().month() - current.date().month() == 0;\r
-                               else\r
-                                       return false;\r
-                       } else {\r
-                               if (noteDate.date().year() < current.date().year())\r
-                                       return true;\r
-                               else\r
-                                       return noteDate.date().month() - current.date().month() != 0;\r
-                       }\r
-               }\r
-               @Override\r
-               public String getLabel(){\r
-                       return QCoreApplication.translate("DateAttributeFilter", "This Month");\r
-               }\r
-       }\r
-       public static class checkLastMonth extends DateAttributeFilter {\r
-               public checkLastMonth(boolean since) {\r
-                       super();\r
-                       checkSince=since; \r
-               }\r
-               // Check if it was within the last two months\r
-               @Override\r
-               public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
-                       int ny = noteDate.date().year();\r
-                       int cy = current.date().year();\r
-                       int nm = noteDate.date().month();\r
-                       int cm = current.date().month();\r
+        if (checkCreated) {\r
+            StringBuilder creationDate = new StringBuilder(simple.format(n.getCreated()));\r
+            return QDateTime.fromString(creationDate.toString(), "MM/dd/yyyy HH:mm:ss");\r
+        } else {\r
+            StringBuilder updatedDate = new StringBuilder(simple.format(n.getUpdated()));\r
+            return QDateTime.fromString(updatedDate.toString(), "MM/dd/yyyy HH:mm:ss");\r
+        }\r
+    }\r
 \r
-                       if (cy-ny >= 0)  {\r
-                               cm = cm+12*(cy-ny);\r
-                       } else {\r
-                               return false;\r
-                       }\r
-                       if (checkSince) {\r
-                               return cm-nm <=1;\r
-                       } else {\r
-                               return cm-nm > 1;\r
-                       }\r
-               }\r
-               @Override\r
-               public String getLabel(){\r
-                       return QCoreApplication.translate("DateAttributeFilter", "Last Month");\r
-               }\r
-       }\r
-       public static class checkYear extends DateAttributeFilter {\r
-               public checkYear(boolean since) {\r
-                       super();\r
-                       checkSince=since; \r
-               }\r
-               // Check if it was within this year\r
-               @Override\r
-               public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
-                       int ny = noteDate.date().year();\r
-                       int cy = current.date().year();\r
-                       if (checkSince)\r
-                               return cy-ny == 0;\r
-                       else\r
-                               return cy-ny > 0;\r
-               }       \r
-               @Override\r
-               public String getLabel(){\r
-                       return QCoreApplication.translate("DateAttributeFilter", "This Year");\r
-               }\r
-       }\r
-       public static class checkLastYear extends DateAttributeFilter {\r
-               public checkLastYear(boolean since) {\r
-                       super();\r
-                       checkSince=since; \r
-               }\r
-               // Check if it was within the last year\r
-               @Override\r
-               public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
-                       int ny = noteDate.date().year();\r
-                       int cy = current.date().year();\r
-                       if (checkSince) \r
-                               return cy-ny <=1;\r
-                       else\r
-                               return cy-ny > 1;\r
-               }\r
-               @Override\r
-               public String getLabel(){\r
-                       return QCoreApplication.translate("DateAttributeFilter", "Last Year");\r
-               }\r
-       }\r
+    protected QDateTime currentTime() {\r
+        QDateTime current = new QDateTime();\r
+        return QDateTime.currentDateTime();\r
+    }\r
 }\r
diff --git a/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java b/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java
new file mode 100644 (file)
index 0000000..59b11bb
--- /dev/null
@@ -0,0 +1,242 @@
+/*\r
+ * This file is part of NeverNote \r
+ * Copyright 2009,2010 Randy Baumgarte\r
+ * Copyright 2010 Hiroshi Miura\r
+ * \r
+ * This file may be licensed under the terms of of the\r
+ * GNU General Public License Version 2 (the ``GPL'').\r
+ *\r
+ * Software distributed under the License is distributed\r
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either\r
+ * express or implied. See the GPL for the specific language\r
+ * governing rights and limitations.\r
+ *\r
+ * You should have received a copy of the GPL along with this\r
+ * program. If not, go to http://www.gnu.org/licenses/gpl.html\r
+ * or write to the Free Software Foundation, Inc.,\r
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r
+ *\r
+*/\r
+\r
+package cx.fbn.nevernote.filters;\r
+\r
+import com.trolltech.qt.core.QCoreApplication;\r
+import com.trolltech.qt.core.QDateTime;\r
+import com.evernote.edam.type.Note;\r
+\r
+import cx.fbn.nevernote.filters.DateAttributeFilter;\r
+\r
+public class DateAttributeFilterFactory {\r
+    private DateAttributeFilterFactory () {};\r
+    public enum FilterType {Today,Yesterday,ThisWeek,LastWeek,Month,LastMonth,Year,LastYear};\r
+\r
+    public static DateAttributeFilter getFilter (FilterType fType, boolean since, boolean created) {\r
+        switch(fType) {\r
+            case Today:\r
+                return new checkToday(since,created);\r
+            case Yesterday:\r
+                return new checkYesterday(since,created);\r
+            case ThisWeek:\r
+                return new checkThisWeek(since,created);\r
+            case LastWeek:\r
+                return new checkLastWeek(since,created);\r
+            case Month:\r
+                return new checkMonth(since,created);\r
+            case LastMonth:\r
+                return new checkLastMonth(since,created);\r
+            case Year:\r
+                return new checkYear(since,created);\r
+            case LastYear:\r
+                return new checkLastYear(since,created);\r
+               }\r
+               throw new IllegalArgumentException("The filter type " + fType + " is not recognized.");\r
+       }\r
+}\r
+\r
+class checkToday extends DateAttributeFilter {\r
+    public checkToday(boolean since,boolean created) {\r
+        super(since, created);\r
+    }\r
+       // Check if it was within the last day\r
+       public boolean attributeCheck(Note n) {\r
+               QDateTime noteDate, current;\r
+               noteDate = noteTime(n);\r
+               current = currentTime();\r
+               if (checkSince)\r
+                       return noteDate.daysTo(current) == 0;\r
+               else \r
+                       return noteDate.daysTo(current) > 0;\r
+       }\r
+       public String getLabel(){\r
+               return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Today");\r
+       }\r
+}\r
+\r
+class checkYesterday extends DateAttributeFilter {\r
+       public checkYesterday(boolean since,boolean created) {\r
+        super(since,created);\r
+    }\r
+\r
+       // Check if it was within the last two days\r
+    public boolean attributeCheck(Note n) {\r
+        QDateTime noteDate, current;\r
+        noteDate = noteTime(n);\r
+        current = currentTime();\r
+               if (checkSince) \r
+                       return noteDate.daysTo(current) <= 1;\r
+               else\r
+                       return noteDate.daysTo(current) > 1;\r
+       }\r
+       public String getLabel(){\r
+               return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Yesterday");\r
+       }\r
+}\r
+\r
+class checkThisWeek extends DateAttributeFilter {\r
+    public checkThisWeek(boolean since,boolean created) {\r
+        super(since,created);\r
+    }\r
+\r
+       // Check if it was within the last two days\r
+    public boolean attributeCheck(Note n) {\r
+        QDateTime noteDate, current;\r
+        noteDate = noteTime(n);\r
+        current = currentTime();\r
+\r
+               if (checkSince) \r
+                       return noteDate.daysTo(current) <= 7;\r
+               else\r
+                       return noteDate.daysTo(current) > 7;\r
+       }\r
+       public String getLabel(){\r
+               return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Week");\r
+       }\r
+}\r
+\r
+class checkLastWeek extends DateAttributeFilter {\r
+    public checkLastWeek(boolean since,boolean created) {\r
+        super(since,created);\r
+    }\r
+\r
+       // Check if it was within the last two weeks\r
+    public boolean attributeCheck(Note n) {\r
+        QDateTime noteDate, current;\r
+        noteDate = noteTime(n);\r
+        current = currentTime();\r
+\r
+               if (checkSince) \r
+                       return noteDate.daysTo(current) <= 14;\r
+               else\r
+                       return noteDate.daysTo(current) > 14;\r
+       }\r
+       public String getLabel(){\r
+               return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Week");\r
+       }\r
+}\r
+\r
+class checkMonth extends DateAttributeFilter {\r
+    public checkMonth(boolean since,boolean created) {\r
+        super(since,created);\r
+    }\r
+\r
+       // Check if it was within the last month\r
+    public boolean attributeCheck(Note n) {\r
+        QDateTime noteDate, current;\r
+        noteDate = noteTime(n);\r
+        current = currentTime();\r
+\r
+               if (checkSince) {\r
+                       if (noteDate.date().year() == current.date().year())\r
+                               return noteDate.date().month() - current.date().month() == 0;\r
+                       else\r
+                               return false;\r
+               } else {\r
+                       if (noteDate.date().year() < current.date().year())\r
+                       return true;\r
+                       else\r
+                               return noteDate.date().month() - current.date().month() != 0;\r
+               }\r
+       }\r
+       public String getLabel(){\r
+               return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Month");\r
+       }\r
+}\r
+\r
+class checkLastMonth extends DateAttributeFilter {\r
+    public checkLastMonth(boolean since,boolean created) {\r
+        super(since,created);\r
+    }\r
+\r
+       // Check if it was within the last two months\r
+    public boolean attributeCheck(Note n) {\r
+        QDateTime noteDate, current;\r
+        noteDate = noteTime(n);\r
+        current = currentTime();\r
+\r
+               int ny = noteDate.date().year();\r
+               int cy = current.date().year();\r
+               int nm = noteDate.date().month();\r
+               int cm = current.date().month();\r
+\r
+               if (cy-ny >= 0)  {\r
+                       cm = cm+12*(cy-ny);\r
+               } else {\r
+                       return false;\r
+               }\r
+               if (checkSince) {\r
+                       return cm-nm <=1;\r
+               } else {\r
+                       return cm-nm > 1;\r
+               }\r
+       }\r
+       public String getLabel(){\r
+               return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Month");\r
+       }\r
+}\r
+\r
+class checkYear extends DateAttributeFilter {\r
+       public checkYear(boolean since,boolean created) {\r
+               super(since,created);\r
+       }\r
+       // Check if it was within this year\r
+    public boolean attributeCheck(Note n) {\r
+        QDateTime noteDate, current;\r
+        noteDate = noteTime(n);\r
+        current = currentTime();\r
+\r
+               int ny = noteDate.date().year();\r
+               int cy = current.date().year();\r
+               if (checkSince)\r
+                       return cy-ny == 0;\r
+               else\r
+                       return cy-ny > 0;\r
+       }       \r
+\r
+       public String getLabel(){\r
+               return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Year");\r
+       }\r
+}\r
+\r
+class checkLastYear extends DateAttributeFilter {\r
+    public checkLastYear(boolean since,boolean created) {\r
+        super(since,created);\r
+    }\r
+\r
+       // Check if it was within the last year\r
+    public boolean attributeCheck(Note n) {\r
+        QDateTime noteDate, current;\r
+        noteDate = noteTime(n);\r
+        current = currentTime();\r
+\r
+               int ny = noteDate.date().year();\r
+               int cy = current.date().year();\r
+               if (checkSince) \r
+                       return cy-ny <=1;\r
+               else\r
+                       return cy-ny > 1;\r
+       }\r
+\r
+       public String getLabel(){\r
+               return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Year");\r
+       }\r
+}\r
index c3766b5..381d1b1 100644 (file)
@@ -1,6 +1,7 @@
 /*\r
  * This file is part of NeverNote \r
- * Copyright 2009 Randy Baumgarte\r
+ * Copyright 2009,2010 Randy Baumgarte\r
+ * Copyright 2010 Hiroshi Miura\r
  * \r
  * This file may be licensed under the terms of of the\r
  * GNU General Public License Version 2 (the ``GPL'').\r
@@ -42,18 +43,18 @@ public class AttributeTreeWidget extends QTreeWidget {
        // Setup the first attribute tree\r
        QTreeWidgetItem created = new QTreeWidgetItem();\r
        created.setText(0,tr("Created"));\r
-       created.setData(0, Qt.ItemDataRole.UserRole, Attributes.Created);\r
+           created.setData(0, Qt.ItemDataRole.UserRole, Attributes.Created);\r
        addTopLevelItem(created);\r
        // Created Since List\r
        QTreeWidgetItem parent = created;\r
        QTreeWidgetItem child;\r
        child = new QTreeWidgetItem();\r
        child.setText(0,tr("Since"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, Attributes.Since);\r
+           child.setData(0,Qt.ItemDataRole.UserRole, Attributes.Since);\r
        parent.addChild(child);         \r
        parent = child;\r
                \r
-       // ------------------------(Since=true/Before=false, Created=true/Updated=false)\r
+               // -Since=true/Before=false, Created=true/Updated=false)\r
        Global.createdBeforeFilter = new DateAttributeFilterTable(false, true);\r
        Global.createdSinceFilter = new DateAttributeFilterTable(true, true);\r
        Global.changedBeforeFilter = new DateAttributeFilterTable(false, false);\r
@@ -74,7 +75,7 @@ public class AttributeTreeWidget extends QTreeWidget {
        parent = created;\r
        child = new QTreeWidgetItem();\r
        child.setText(0,tr("Before"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, Attributes.Before);\r
+           child.setData(0,Qt.ItemDataRole.UserRole, Attributes.Before);\r
        created.addChild(child);\r
        parent = child;\r
        for (int i=0; i<Global.createdBeforeFilter.size(); i++) {\r
@@ -87,14 +88,14 @@ public class AttributeTreeWidget extends QTreeWidget {
        \r
        QTreeWidgetItem lastModified = new QTreeWidgetItem();\r
        lastModified.setText(0,tr("Last Modified"));\r
-       lastModified.setData(0,Qt.ItemDataRole.UserRole, Attributes.LastModified);\r
+           lastModified.setData(0,Qt.ItemDataRole.UserRole, Attributes.LastModified);\r
        addTopLevelItem(lastModified);\r
  \r
        // Changed Since List\r
        parent = lastModified;\r
        child = new QTreeWidgetItem();\r
        child.setText(0,tr("Since"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, Attributes.Since);\r
+       child.setData(0,Qt.ItemDataRole.UserRole, Attributes.Since);\r
        lastModified.addChild(child);\r
        parent = child;\r
        for (int i=0; i<Global.changedSinceFilter.size(); i++) {\r
@@ -108,7 +109,7 @@ public class AttributeTreeWidget extends QTreeWidget {
        parent = created;\r
        child = new QTreeWidgetItem();\r
        child.setText(0,tr("Before"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, Attributes.Before);\r
+               child.setData(0,Qt.ItemDataRole.UserRole, Attributes.Before);\r
        lastModified.addChild(child);\r
        parent = child;\r
        for (int i=0; i<Global.changedBeforeFilter.size(); i++) {\r
@@ -121,62 +122,15 @@ public class AttributeTreeWidget extends QTreeWidget {
        // Now we are into the other attributes\r
        QTreeWidgetItem contains = new QTreeWidgetItem();\r
        contains.setText(0,tr("Contains"));\r
-       contains.setData(0,Qt.ItemDataRole.UserRole,"Contains");\r
+           contains.setData(0,Qt.ItemDataRole.UserRole,"Contains");\r
        addTopLevelItem(contains);\r
-       child = new QTreeWidgetItem();\r
-       child.setText(0,tr("Images"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, "Images");\r
-       child.setIcon(0, icon);\r
-       contains.addChild(child);\r
-       \r
-       child = new QTreeWidgetItem();\r
-       child.setText(0,tr("Audio"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, "Audio");\r
-       child.setIcon(0, icon);\r
-       contains.addChild(child);\r
-       \r
-       child = new QTreeWidgetItem();\r
-       child.setText(0,tr("Ink"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, "Ink");\r
-       child.setIcon(0, icon);\r
-       contains.addChild(child);\r
-       \r
-       child = new QTreeWidgetItem();\r
-       child.setText(0,tr("Encrypted Text"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, "Encrypted Text");\r
-       child.setIcon(0, icon);\r
-       contains.addChild(child);\r
-       \r
-       \r
-       child = new QTreeWidgetItem();\r
-       child.setText(0,tr("To-Do Items"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, "To-Do Items");\r
-       child.setIcon(0, icon);\r
-       contains.addChild(child);\r
-       \r
-       child = new QTreeWidgetItem();\r
-       child.setText(0,tr("Unfinished to-do items"));\r
-       child.setData(0, Qt.ItemDataRole.UserRole, "Unfinished to-do items");\r
-       child.setIcon(0, icon);\r
-       contains.addChild(child);\r
-       \r
-       child = new QTreeWidgetItem();\r
-       child.setText(0,tr("Finished to-do items"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, "Finished to-do items");\r
-       child.setIcon(0, icon);\r
-       contains.addChild(child);\r
-       \r
-       child = new QTreeWidgetItem();\r
-       child.setText(0,tr("Attachment"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, "Attachment");\r
-       child.setIcon(0, icon);\r
-       contains.addChild(child);\r
-       \r
-       child = new QTreeWidgetItem();\r
-       child.setText(0,tr("PDF"));\r
-       child.setData(0,Qt.ItemDataRole.UserRole, "PDF");\r
-       child.setIcon(0, icon);\r
-       contains.addChild(child);\r
+\r
+        for (int i=0; i<Global.containsFilter.size(); i++) {\r
+               child = new QTreeWidgetItem();\r
+               child.setText(0,Global.containsFilter.getLabel(i));\r
+               child.setIcon(0, icon);\r
+               contains.addChild(child);\r
+           }\r
        \r
        }\r
        \r
index d82241a..acbd14a 100644 (file)
@@ -1,6 +1,7 @@
 /*\r
  * This file is part of NeverNote \r
- * Copyright 2009 Randy Baumgarte\r
+ * Copyright 2009,2010 Randy Baumgarte\r
+ * Copyright 2010 Hiroshi Miura \r
  * \r
  * This file may be licensed under the terms of of the\r
  * GNU General Public License Version 2 (the ``GPL'').\r
@@ -23,24 +24,18 @@ import java.util.ArrayList;
 \r
 import com.evernote.edam.type.Note;\r
 \r
+import cx.fbn.nevernote.filters.AttributeFilter;\r
 import cx.fbn.nevernote.filters.ContainsAttributeFilter;\r
+import cx.fbn.nevernote.filters.ContainsAttributeFilterFactory;\r
 import cx.fbn.nevernote.sql.NoteTable;\r
 \r
 public class ContainsAttributeFilterTable {\r
        ArrayList<ContainsAttributeFilter> table;\r
        \r
-       public ContainsAttributeFilterTable() {\r
-               table = new ArrayList<ContainsAttributeFilter>();\r
-               table.add(new ContainsAttributeFilter.Mime("Image", "image/"));\r
-               table.add(new ContainsAttributeFilter.Mime("Audio", "audio/"));\r
-               table.add(new ContainsAttributeFilter.Mime("Ink", "application/vnd.evernote.ink"));\r
-               table.add(new ContainsAttributeFilter.Content("Encrypted Text", "<en-crypt"));\r
-               table.add(new ContainsAttributeFilter.Content("To-Do Items", "<en-todo"));\r
-               table.add(new ContainsAttributeFilter.Todo("Unfinished to-do items", false));\r
-               table.add(new ContainsAttributeFilter.Todo("Finished to-do items", true));\r
-               table.add(new ContainsAttributeFilter.Attachment("Attachment"));\r
-               table.add(new ContainsAttributeFilter.Mime("PDF","application/pdf"));\r
-               \r
+    public ContainsAttributeFilterTable() {\r
+        table = new ArrayList<ContainsAttributeFilter>();\r
+        for (ContainsAttributeFilterFactory.Contains type: ContainsAttributeFilterFactory.Contains.values()) \r
+               table.add(ContainsAttributeFilterFactory.create(type));\r
        }\r
        \r
        public void reset() {\r
@@ -48,11 +43,6 @@ public class ContainsAttributeFilterTable {
                        table.get(i).set(false);\r
        }\r
        \r
-       public void select(String name) {\r
-               for (int i=0; i<table.size(); i++) \r
-                       if (table.get(i).getName().equalsIgnoreCase(name))\r
-                               table.get(i).set(true);\r
-       }\r
        public void select(int i) {\r
                table.get(i).set(true);\r
        }\r
@@ -73,15 +63,15 @@ public class ContainsAttributeFilterTable {
                for (int i=0; i<table.size(); i++) {\r
                        if (table.get(i).isSet()) {\r
                                n = sqlTable.getNote(n.getGuid(), true, true, false, false, false);\r
-                               if (!table.get(i).checkContent(n)) \r
+                               if (!table.get(i).attributeCheck(n)) \r
                                        return false;\r
                        }\r
                }\r
                return true;\r
        }\r
        \r
-       // Get the name of a particular attribute check\r
-       public String getName(int i) {\r
-               return table.get(i).getName();\r
+       // Get the label of a particular attribute check\r
+       public String getLabel(int i) {\r
+               return table.get(i).getLabel();\r
        }\r
 }\r
index e651fed..2003bad 100644 (file)
 \r
 package cx.fbn.nevernote.gui;\r
 \r
-import java.text.SimpleDateFormat;\r
 import java.util.ArrayList;\r
-\r
 import com.evernote.edam.type.Note;\r
-import com.trolltech.qt.core.QDateTime;\r
-\r
 import cx.fbn.nevernote.filters.DateAttributeFilter;\r
+import cx.fbn.nevernote.filters.DateAttributeFilterFactory;\r
 \r
 public class DateAttributeFilterTable {\r
        ArrayList<DateAttributeFilter> table;\r
-       private final boolean checkCreated;\r
-\r
        public DateAttributeFilterTable(boolean since, boolean created) {\r
-               checkCreated = created;\r
                table = new ArrayList<DateAttributeFilter>();\r
-               table.add(new DateAttributeFilter.checkToday(since));\r
-               table.add(new DateAttributeFilter.checkYesterday(since));\r
-               table.add(new DateAttributeFilter.checkThisWeek(since));\r
-               table.add(new DateAttributeFilter.checkLastWeek(since));\r
-               table.add(new DateAttributeFilter.checkMonth(since));\r
-               table.add(new DateAttributeFilter.checkLastMonth( since));\r
-               table.add(new DateAttributeFilter.checkYear(since));\r
-               table.add(new DateAttributeFilter.checkLastYear(since));\r
+               for (DateAttributeFilterFactory.FilterType type: DateAttributeFilterFactory.FilterType.values()) {\r
+                       table.add(DateAttributeFilterFactory.getFilter(type,since,created));\r
+               }\r
        }\r
        \r
        public void reset() {\r
@@ -66,23 +55,9 @@ public class DateAttributeFilterTable {
        }\r
        \r
        public boolean check(Note n) {\r
-               QDateTime noteDate;\r
-               String dateTimeFormat = new String("MM/dd/yyyy HH:mm:ss");\r
-               SimpleDateFormat simple = new SimpleDateFormat(dateTimeFormat);\r
-               if (checkCreated) {\r
-                       StringBuilder creationDate = new StringBuilder(simple.format(n.getCreated()));\r
-                       noteDate = QDateTime.fromString(creationDate.toString(), "MM/dd/yyyy HH:mm:ss");\r
-               } else {\r
-                       StringBuilder updatedDate = new StringBuilder(simple.format(n.getUpdated()));\r
-                       noteDate = QDateTime.fromString(updatedDate.toString(), "MM/dd/yyyy HH:mm:ss");\r
-               }\r
-               \r
-               QDateTime current = new QDateTime();\r
-               current = QDateTime.currentDateTime();\r
-               \r
                for (int i=0; i<table.size(); i++) {\r
                        if (table.get(i).isSet()\r
-                          && !table.get(i).attributeCheck(noteDate, current))\r
+                          && !table.get(i).attributeCheck(n))\r
                                return false;\r
                }\r
                return true;\r
index 5886be8..3b1d9bb 100644 (file)
@@ -322,7 +322,7 @@ public class TableView extends QTableView {
                menu.addAction(mergeNotesAction);\r
                \r
                QMenu titleColorMenu = new QMenu();\r
-               titleColorMenu.setTitle("Title Color");\r
+               titleColorMenu.setTitle(tr("Title Color"));\r
                menu.addMenu(titleColorMenu);\r
                noteTitleColorWhite = new QAction(titleColorMenu);\r
            noteTitleColorRed = new QAction(titleColorMenu);\r
index f30f254..8b155b7 100644 (file)
@@ -1,6 +1,7 @@
 /*\r
  * This file is part of NeverNote \r
- * Copyright 2009 Randy Baumgarte\r
+ * Copyright 2009,2010 Randy Baumgarte\r
+ * Copyright 2010 Hiroshi Miura\r
  * \r
  * This file may be licensed under the terms of of the\r
  * GNU General Public License Version 2 (the ``GPL'').\r
index fa5d8d4..0bfb8ea 100644 (file)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1080"/>
         <source>Edit Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1150"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1140"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>Unable to Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1141"/>
         <source>Some of the selected notebook(s) contain notes.
 Please delete the notes or move them to another notebook before deleting any notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>You must have at least one notebook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1357"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1796"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3202"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4395"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1348"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1789"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3132"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4377"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
         <source>Delete the selected notebooks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1357"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1348"/>
         <source>Delete the selected tags?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1605"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1598"/>
         <source>Edit Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1798"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1791"/>
         <source>This will free unused space in the database, but please be aware that depending upon the size of your database this can be time consuming and NeverNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1831"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1824"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1847"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1840"/>
         <source>Mesasge Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1856"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1849"/>
         <source>About NeverNote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1858"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1851"/>
         <source>&lt;h4&gt;&lt;center&gt;&lt;b&gt;NeverNote&lt;/b&gt;&lt;/center&gt;&lt;/h4&gt;&lt;hr&gt;&lt;center&gt;Version </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1866"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1859"/>
         <source>&lt;hr&gt;&lt;/center&gt;Evernote Generic client.&lt;br&gt;&lt;br&gt;Licensed under GPL v2.  &lt;br&gt;&lt;hr&gt;&lt;br&gt;Evernote is copyright 2001-2010 by Evernote Corporation&lt;br&gt;Jambi and QT are the licensed trademark of Nokia Corporation&lt;br&gt;PDFRenderer is licened under the LGPL&lt;br&gt;Jazzy is licened under the LGPL&lt;br&gt;Java is a registered trademark of Sun Microsystems.&lt;br&gt;&lt;hr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1938"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1931"/>
         <source>toolBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2000"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1993"/>
         <source>Quota:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2013"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2006"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2018"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2011"/>
         <source>  Search:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2199"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2256"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2192"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2249"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2200"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2257"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2193"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2250"/>
         <source>Connect to Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2260"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2253"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2261"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2254"/>
         <source>Disconnect from Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3163"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3134"/>
         <source>This will cause all notes &amp; attachments to be reindexed, but please be aware that depending upon the size of your database updating all these records can be time consuming and NeverNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3170"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3141"/>
         <source>Marking notes for reindex.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3144"/>
         <source>Database will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3185"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3156"/>
         <source>Notes will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3187"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3158"/>
         <source>Note will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3202"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
         <source>Delete selected note(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3616"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3597"/>
+        <source>Error Saving Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3619"/>
         <source>Note has never been synchronized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3617"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3620"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3617"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3620"/>
         <source>This note has never been sent to Evernote, so there is no history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3621"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3624"/>
         <source>Getting Note History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3638"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3641"/>
         <source>Note not found on server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3662"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3665"/>
         <source>History retrieved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3720"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3723"/>
         <source>Restoring as new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3722"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3725"/>
         <source>Note has been restored as a new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3726"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3729"/>
         <source>Restoring note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3738"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3741"/>
         <source>Note has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4069"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4072"/>
         <source>DOUGH!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4078"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4081"/>
         <source>Well, this is embarrassing.
 
 Some attachments or images for this note appear to be missing from my database.
@@ -237,97 +242,97 @@ Who knows, you might get lucky.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4121"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4124"/>
         <source>Finalizing Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4154"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4142"/>
         <source>Synchronization Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4257"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4239"/>
         <source>Index completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4271"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4281"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4253"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4263"/>
         <source>Indexing notes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4295"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4277"/>
         <source>Indexing is now enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4297"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4279"/>
         <source>Indexing is now disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4312"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4320"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4328"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4336"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4343"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4350"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4294"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4302"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4310"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4318"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4325"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4332"/>
         <source>A thread his died.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4313"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4295"/>
         <source>It appears as the tag counter thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4321"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4303"/>
         <source>It appears as the notebook counter thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4337"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4319"/>
         <source>It appears as the note saver thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4344"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4326"/>
         <source>It appears as the synchronization thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4333"/>
         <source>It appears as the index thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4368"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4441"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4350"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4423"/>
         <source>Backup Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4369"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4410"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4442"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4475"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4392"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4424"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4457"/>
         <source>NeverNote Export (*.nnex);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4378"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4360"/>
         <source>Backing up database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4388"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4370"/>
         <source>Database backup completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4399"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4381"/>
         <source>This is used to restore a database from backups.
 It is HIGHLY recommened that this only be used to populate
 an empty database.  Restoring into a database that
@@ -337,37 +342,37 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4409"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4391"/>
         <source>Restore Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4419"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4401"/>
         <source>Restoring database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4433"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4415"/>
         <source>Database has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4451"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4433"/>
         <source>Exporting Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4463"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4445"/>
         <source>Export completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4474"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4456"/>
         <source>Import Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4512"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4494"/>
         <source>Notes have been imported.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -398,72 +403,77 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.ConfigAppearancePage</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="76"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="77"/>
         <source>GUI Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="82"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="83"/>
         <source>Use standard palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="92"/>
         <source>Tag Behavior</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="93"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="94"/>
         <source>Do nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="94"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="95"/>
         <source>Count tags &amp; do not hide inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="95"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="96"/>
         <source>Count tags &amp; hide inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="96"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="97"/>
         <source>Color active tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="105"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="106"/>
         <source>Date/Time Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="121"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="122"/>
         <source>Mimic Evernote Selection Behavior (Requires Restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="122"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="123"/>
         <source>Show Splash Screen on Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="123"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="124"/>
         <source>Show Tray Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="124"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="125"/>
         <source>Verify Deletes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="125"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="126"/>
         <source>Display PDF Documents Inline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="128"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="127"/>
+        <source>Create New Notes With Selected Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="130"/>
         <source>Automatic Save Interval (in Minutes)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -572,32 +582,32 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="228"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="233"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="234"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="239"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="240"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="245"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="246"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="251"/>
         <source>Hide Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="252"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="257"/>
         <source>Hide Edit Buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="258"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="263"/>
         <source>Debugging</source>
         <translation type="unfinished"></translation>
     </message>
@@ -974,6 +984,11 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/EnCryptDialog.java" line="74"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/cx/fbn/nevernote/dialog/EnCryptDialog.java" line="120"/>
         <source>Password must be at least 4 characters</source>
         <translation type="unfinished"></translation>
@@ -1269,6 +1284,26 @@ Are you sure you want to continue?</source>
         <source>Add a search</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="48"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="51"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="57"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="60"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.dialog.TableDialog</name>
@@ -1367,49 +1402,49 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.WatchFolder</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="58"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="59"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="62"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="63"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="70"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="71"/>
         <source>Auto Import Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="74"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="75"/>
         <source>Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="75"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="76"/>
         <source>Target Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="76"/>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="167"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="77"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="168"/>
         <source>Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="87"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="88"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="92"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="96"/>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="170"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="97"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="171"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1458,235 +1493,287 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>cx.fbn.nevernote.gui.AttributeTreeWidget</name>
+    <name>cx.fbn.nevernote.filters.ContainsAttributeFilter</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="32"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="35"/>
-        <source>Attributes</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="36"/>
+        <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="40"/>
-        <source>Created</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="39"/>
+        <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="46"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="96"/>
-        <source>Since</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="42"/>
+        <source>Ink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="78"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="109"/>
-        <source>Before</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="45"/>
+        <source>Encrypted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="90"/>
-        <source>Last Modified</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="48"/>
+        <source>ToDo Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="121"/>
-        <source>Contains</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="51"/>
+        <source>Unfinished to-do items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="124"/>
-        <source>Images</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="54"/>
+        <source>Finished to-do items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="129"/>
-        <source>Audio</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="57"/>
+        <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="134"/>
-        <source>Ink</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="60"/>
+        <source>PDF</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>cx.fbn.nevernote.filters.DateAttributeFilter</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="139"/>
-        <source>Encrypted Text</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="71"/>
+        <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="145"/>
-        <source>To-Do Items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="91"/>
+        <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="150"/>
-        <source>Unfinished to-do items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="112"/>
+        <source>This Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="155"/>
-        <source>Finished to-do items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="133"/>
+        <source>Last Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="160"/>
-        <source>Attachment</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="161"/>
+        <source>This Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="165"/>
-        <source>PDF</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="193"/>
+        <source>Last Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="216"/>
+        <source>This Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="240"/>
+        <source>Last Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>cx.fbn.nevernote.gui.AttributeTreeWidget</name>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="37"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="40"/>
+        <source>Attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="45"/>
+        <source>Created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="52"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="97"/>
+        <source>Since</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="77"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="111"/>
+        <source>Before</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="90"/>
+        <source>Last Modified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="124"/>
+        <source>Contains</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.gui.BrowserWindow</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="232"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="233"/>
         <source>Subject Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="239"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="240"/>
         <source>Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="240"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="241"/>
         <source>Created:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="249"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="250"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="250"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="251"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="251"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="252"/>
         <source>View On Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="321"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="322"/>
         <source>Undo Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="322"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="323"/>
         <source>Redo Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="323"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="324"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="324"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="325"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="325"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="326"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="326"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="327"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="327"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="328"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="328"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="329"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="330"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="331"/>
         <source>Right Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="331"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="332"/>
         <source>Left Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="332"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="333"/>
         <source>Center Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="334"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="335"/>
         <source>Strikethrough</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="335"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="336"/>
         <source>Insert Horizontal Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="336"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="337"/>
         <source>Shift Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="337"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="338"/>
         <source>Shift Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="338"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="339"/>
         <source>Bullet List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="339"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="340"/>
         <source>Number List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="394"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="395"/>
         <source>Font Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="399"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="400"/>
         <source>Font Hilight Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="514"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="516"/>
         <source>Source URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="567"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="570"/>
         <source>Source URL:    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="572"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="581"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="582"/>
+        <source>http://</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="590"/>
         <source>Author:        </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="695"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="713"/>
         <source>Unable Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="697"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="715"/>
         <source>This is an ink note.
 Ink notes are not supported since Evernote has not
  published any specifications on them
@@ -1694,54 +1781,54 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1108"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1108"/>
         <source>Error Encrypting String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1462"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1469"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1504"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1511"/>
         <source>Untitled Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1799"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1845"/>
         <source>Non-premium accounts can only attach JPG, PNG, GIF, MP3, WAV, AMR, or PDF files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1800"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1846"/>
         <source>Non-Premium Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1819"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1865"/>
         <source>A file attachment may not exceed 25MB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1820"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1866"/>
         <source>Attachment Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1906"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1958"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1953"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2005"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2076"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2122"/>
         <source>Insert Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2170"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2216"/>
         <source>Edit Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2308,107 +2395,115 @@ and I&apos;m too lazy to figure them out by myself.</source>
 <context>
     <name>cx.fbn.nevernote.gui.TableView</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="96"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="92"/>
         <source>Date Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="97"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="93"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="98"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="94"/>
         <source>Guid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="99"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="95"/>
         <source>Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="100"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="96"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="101"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="97"/>
         <source>Date Changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="102"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="98"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="103"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="99"/>
         <source>Source Url</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="104"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="100"/>
         <source>Subject Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="105"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="101"/>
         <source>Synchronized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="373"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="316"/>
         <source>Title Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="385"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="328"/>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="386"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="329"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="387"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="330"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="388"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="331"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="389"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="332"/>
         <source>Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="390"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="333"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="391"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="334"/>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="392"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="335"/>
         <source>Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="393"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="336"/>
         <source>Magenta</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>cx.fbn.nevernote.gui.TagTreeWidget</name>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/TagTreeWidget.java" line="64"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>cx.fbn.nevernote.threads.SyncRunner</name>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="237"/>
@@ -2459,24 +2554,24 @@ and I&apos;m too lazy to figure them out by myself.</source>
     </message>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="457"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="535"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="565"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="570"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="575"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="654"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="659"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="664"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="747"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="752"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="757"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="532"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="562"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="567"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="572"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="651"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="656"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="661"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="744"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="749"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="754"/>
         <source>Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="467"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="530"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="540"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="545"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="527"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="537"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="542"/>
         <source>Error sending local note: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2486,32 +2581,32 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="558"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="555"/>
         <source>Sending local notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="647"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="644"/>
         <source>Sending local tags.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="740"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="737"/>
         <source>Sending saved searches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="843"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="840"/>
         <source>Downloading 0% complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="928"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="925"/>
         <source>Downloading </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="928"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="925"/>
         <source>% complete.</source>
         <translation type="unfinished"></translation>
     </message>
index 5c2df7f..96c2309 100644 (file)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1080"/>
         <source>Edit Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1150"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1140"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>Unable to Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1141"/>
         <source>Some of the selected notebook(s) contain notes.
 Please delete the notes or move them to another notebook before deleting any notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>You must have at least one notebook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1357"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1796"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3202"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4395"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1348"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1789"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3132"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4377"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
         <source>Delete the selected notebooks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1357"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1348"/>
         <source>Delete the selected tags?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1605"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1598"/>
         <source>Edit Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1798"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1791"/>
         <source>This will free unused space in the database, but please be aware that depending upon the size of your database this can be time consuming and NeverNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1831"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1824"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1847"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1840"/>
         <source>Mesasge Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1856"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1849"/>
         <source>About NeverNote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1858"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1851"/>
         <source>&lt;h4&gt;&lt;center&gt;&lt;b&gt;NeverNote&lt;/b&gt;&lt;/center&gt;&lt;/h4&gt;&lt;hr&gt;&lt;center&gt;Version </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1866"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1859"/>
         <source>&lt;hr&gt;&lt;/center&gt;Evernote Generic client.&lt;br&gt;&lt;br&gt;Licensed under GPL v2.  &lt;br&gt;&lt;hr&gt;&lt;br&gt;Evernote is copyright 2001-2010 by Evernote Corporation&lt;br&gt;Jambi and QT are the licensed trademark of Nokia Corporation&lt;br&gt;PDFRenderer is licened under the LGPL&lt;br&gt;Jazzy is licened under the LGPL&lt;br&gt;Java is a registered trademark of Sun Microsystems.&lt;br&gt;&lt;hr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1938"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1931"/>
         <source>toolBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2000"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1993"/>
         <source>Quota:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2013"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2006"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2018"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2011"/>
         <source>  Search:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2199"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2256"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2192"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2249"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2200"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2257"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2193"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2250"/>
         <source>Connect to Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2260"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2253"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2261"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2254"/>
         <source>Disconnect from Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3163"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3134"/>
         <source>This will cause all notes &amp; attachments to be reindexed, but please be aware that depending upon the size of your database updating all these records can be time consuming and NeverNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3170"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3141"/>
         <source>Marking notes for reindex.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3144"/>
         <source>Database will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3185"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3156"/>
         <source>Notes will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3187"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3158"/>
         <source>Note will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3202"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
         <source>Delete selected note(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3616"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3597"/>
+        <source>Error Saving Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3619"/>
         <source>Note has never been synchronized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3617"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3620"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3617"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3620"/>
         <source>This note has never been sent to Evernote, so there is no history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3621"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3624"/>
         <source>Getting Note History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3638"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3641"/>
         <source>Note not found on server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3662"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3665"/>
         <source>History retrieved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3720"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3723"/>
         <source>Restoring as new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3722"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3725"/>
         <source>Note has been restored as a new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3726"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3729"/>
         <source>Restoring note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3738"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3741"/>
         <source>Note has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4069"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4072"/>
         <source>DOUGH!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4078"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4081"/>
         <source>Well, this is embarrassing.
 
 Some attachments or images for this note appear to be missing from my database.
@@ -237,97 +242,97 @@ Who knows, you might get lucky.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4121"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4124"/>
         <source>Finalizing Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4154"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4142"/>
         <source>Synchronization Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4257"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4239"/>
         <source>Index completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4271"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4281"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4253"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4263"/>
         <source>Indexing notes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4295"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4277"/>
         <source>Indexing is now enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4297"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4279"/>
         <source>Indexing is now disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4312"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4320"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4328"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4336"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4343"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4350"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4294"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4302"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4310"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4318"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4325"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4332"/>
         <source>A thread his died.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4313"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4295"/>
         <source>It appears as the tag counter thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4321"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4303"/>
         <source>It appears as the notebook counter thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4337"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4319"/>
         <source>It appears as the note saver thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4344"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4326"/>
         <source>It appears as the synchronization thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4333"/>
         <source>It appears as the index thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4368"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4441"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4350"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4423"/>
         <source>Backup Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4369"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4410"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4442"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4475"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4392"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4424"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4457"/>
         <source>NeverNote Export (*.nnex);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4378"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4360"/>
         <source>Backing up database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4388"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4370"/>
         <source>Database backup completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4399"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4381"/>
         <source>This is used to restore a database from backups.
 It is HIGHLY recommened that this only be used to populate
 an empty database.  Restoring into a database that
@@ -337,37 +342,37 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4409"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4391"/>
         <source>Restore Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4419"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4401"/>
         <source>Restoring database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4433"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4415"/>
         <source>Database has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4451"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4433"/>
         <source>Exporting Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4463"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4445"/>
         <source>Export completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4474"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4456"/>
         <source>Import Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4512"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4494"/>
         <source>Notes have been imported.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -398,72 +403,77 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.ConfigAppearancePage</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="76"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="77"/>
         <source>GUI Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="82"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="83"/>
         <source>Use standard palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="92"/>
         <source>Tag Behavior</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="93"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="94"/>
         <source>Do nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="94"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="95"/>
         <source>Count tags &amp; do not hide inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="95"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="96"/>
         <source>Count tags &amp; hide inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="96"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="97"/>
         <source>Color active tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="105"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="106"/>
         <source>Date/Time Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="121"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="122"/>
         <source>Mimic Evernote Selection Behavior (Requires Restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="122"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="123"/>
         <source>Show Splash Screen on Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="123"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="124"/>
         <source>Show Tray Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="124"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="125"/>
         <source>Verify Deletes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="125"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="126"/>
         <source>Display PDF Documents Inline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="128"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="127"/>
+        <source>Create New Notes With Selected Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="130"/>
         <source>Automatic Save Interval (in Minutes)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -572,32 +582,32 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="228"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="233"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="234"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="239"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="240"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="245"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="246"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="251"/>
         <source>Hide Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="252"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="257"/>
         <source>Hide Edit Buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="258"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="263"/>
         <source>Debugging</source>
         <translation type="unfinished"></translation>
     </message>
@@ -974,6 +984,11 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/EnCryptDialog.java" line="74"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/cx/fbn/nevernote/dialog/EnCryptDialog.java" line="120"/>
         <source>Password must be at least 4 characters</source>
         <translation type="unfinished"></translation>
@@ -1269,6 +1284,26 @@ Are you sure you want to continue?</source>
         <source>Add a search</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="48"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="51"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="57"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="60"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.dialog.TableDialog</name>
@@ -1367,49 +1402,49 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.WatchFolder</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="58"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="59"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="62"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="63"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="70"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="71"/>
         <source>Auto Import Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="74"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="75"/>
         <source>Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="75"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="76"/>
         <source>Target Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="76"/>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="167"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="77"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="168"/>
         <source>Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="87"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="88"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="92"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="96"/>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="170"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="97"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="171"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1458,235 +1493,287 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>cx.fbn.nevernote.gui.AttributeTreeWidget</name>
+    <name>cx.fbn.nevernote.filters.ContainsAttributeFilter</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="32"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="35"/>
-        <source>Attributes</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="36"/>
+        <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="40"/>
-        <source>Created</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="39"/>
+        <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="46"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="96"/>
-        <source>Since</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="42"/>
+        <source>Ink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="78"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="109"/>
-        <source>Before</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="45"/>
+        <source>Encrypted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="90"/>
-        <source>Last Modified</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="48"/>
+        <source>ToDo Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="121"/>
-        <source>Contains</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="51"/>
+        <source>Unfinished to-do items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="124"/>
-        <source>Images</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="54"/>
+        <source>Finished to-do items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="129"/>
-        <source>Audio</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="57"/>
+        <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="134"/>
-        <source>Ink</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="60"/>
+        <source>PDF</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>cx.fbn.nevernote.filters.DateAttributeFilter</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="139"/>
-        <source>Encrypted Text</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="71"/>
+        <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="145"/>
-        <source>To-Do Items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="91"/>
+        <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="150"/>
-        <source>Unfinished to-do items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="112"/>
+        <source>This Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="155"/>
-        <source>Finished to-do items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="133"/>
+        <source>Last Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="160"/>
-        <source>Attachment</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="161"/>
+        <source>This Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="165"/>
-        <source>PDF</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="193"/>
+        <source>Last Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="216"/>
+        <source>This Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="240"/>
+        <source>Last Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>cx.fbn.nevernote.gui.AttributeTreeWidget</name>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="37"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="40"/>
+        <source>Attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="45"/>
+        <source>Created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="52"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="97"/>
+        <source>Since</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="77"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="111"/>
+        <source>Before</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="90"/>
+        <source>Last Modified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="124"/>
+        <source>Contains</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.gui.BrowserWindow</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="232"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="233"/>
         <source>Subject Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="239"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="240"/>
         <source>Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="240"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="241"/>
         <source>Created:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="249"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="250"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="250"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="251"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="251"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="252"/>
         <source>View On Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="321"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="322"/>
         <source>Undo Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="322"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="323"/>
         <source>Redo Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="323"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="324"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="324"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="325"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="325"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="326"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="326"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="327"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="327"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="328"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="328"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="329"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="330"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="331"/>
         <source>Right Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="331"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="332"/>
         <source>Left Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="332"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="333"/>
         <source>Center Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="334"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="335"/>
         <source>Strikethrough</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="335"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="336"/>
         <source>Insert Horizontal Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="336"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="337"/>
         <source>Shift Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="337"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="338"/>
         <source>Shift Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="338"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="339"/>
         <source>Bullet List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="339"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="340"/>
         <source>Number List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="394"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="395"/>
         <source>Font Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="399"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="400"/>
         <source>Font Hilight Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="514"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="516"/>
         <source>Source URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="567"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="570"/>
         <source>Source URL:    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="572"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="581"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="582"/>
+        <source>http://</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="590"/>
         <source>Author:        </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="695"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="713"/>
         <source>Unable Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="697"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="715"/>
         <source>This is an ink note.
 Ink notes are not supported since Evernote has not
  published any specifications on them
@@ -1694,54 +1781,54 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1108"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1108"/>
         <source>Error Encrypting String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1462"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1469"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1504"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1511"/>
         <source>Untitled Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1799"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1845"/>
         <source>Non-premium accounts can only attach JPG, PNG, GIF, MP3, WAV, AMR, or PDF files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1800"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1846"/>
         <source>Non-Premium Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1819"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1865"/>
         <source>A file attachment may not exceed 25MB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1820"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1866"/>
         <source>Attachment Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1906"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1958"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1953"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2005"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2076"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2122"/>
         <source>Insert Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2170"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2216"/>
         <source>Edit Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2308,107 +2395,115 @@ and I&apos;m too lazy to figure them out by myself.</source>
 <context>
     <name>cx.fbn.nevernote.gui.TableView</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="96"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="92"/>
         <source>Date Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="97"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="93"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="98"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="94"/>
         <source>Guid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="99"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="95"/>
         <source>Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="100"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="96"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="101"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="97"/>
         <source>Date Changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="102"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="98"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="103"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="99"/>
         <source>Source Url</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="104"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="100"/>
         <source>Subject Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="105"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="101"/>
         <source>Synchronized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="373"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="316"/>
         <source>Title Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="385"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="328"/>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="386"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="329"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="387"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="330"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="388"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="331"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="389"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="332"/>
         <source>Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="390"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="333"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="391"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="334"/>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="392"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="335"/>
         <source>Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="393"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="336"/>
         <source>Magenta</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>cx.fbn.nevernote.gui.TagTreeWidget</name>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/TagTreeWidget.java" line="64"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>cx.fbn.nevernote.threads.SyncRunner</name>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="237"/>
@@ -2459,24 +2554,24 @@ and I&apos;m too lazy to figure them out by myself.</source>
     </message>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="457"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="535"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="565"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="570"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="575"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="654"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="659"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="664"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="747"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="752"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="757"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="532"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="562"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="567"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="572"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="651"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="656"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="661"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="744"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="749"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="754"/>
         <source>Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="467"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="530"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="540"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="545"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="527"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="537"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="542"/>
         <source>Error sending local note: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2486,32 +2581,32 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="558"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="555"/>
         <source>Sending local notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="647"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="644"/>
         <source>Sending local tags.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="740"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="737"/>
         <source>Sending saved searches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="843"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="840"/>
         <source>Downloading 0% complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="928"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="925"/>
         <source>Downloading </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="928"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="925"/>
         <source>% complete.</source>
         <translation type="unfinished"></translation>
     </message>
index 62533e6..7606ae4 100644 (file)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1080"/>
         <source>Edit Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1150"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1140"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>Unable to Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1141"/>
         <source>Some of the selected notebook(s) contain notes.
 Please delete the notes or move them to another notebook before deleting any notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>You must have at least one notebook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1357"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1796"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3202"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4395"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1348"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1789"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3132"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4377"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
         <source>Delete the selected notebooks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1357"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1348"/>
         <source>Delete the selected tags?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1605"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1598"/>
         <source>Edit Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1798"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1791"/>
         <source>This will free unused space in the database, but please be aware that depending upon the size of your database this can be time consuming and NeverNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1831"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1824"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1847"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1840"/>
         <source>Mesasge Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1856"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1849"/>
         <source>About NeverNote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1858"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1851"/>
         <source>&lt;h4&gt;&lt;center&gt;&lt;b&gt;NeverNote&lt;/b&gt;&lt;/center&gt;&lt;/h4&gt;&lt;hr&gt;&lt;center&gt;Version </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1866"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1859"/>
         <source>&lt;hr&gt;&lt;/center&gt;Evernote Generic client.&lt;br&gt;&lt;br&gt;Licensed under GPL v2.  &lt;br&gt;&lt;hr&gt;&lt;br&gt;Evernote is copyright 2001-2010 by Evernote Corporation&lt;br&gt;Jambi and QT are the licensed trademark of Nokia Corporation&lt;br&gt;PDFRenderer is licened under the LGPL&lt;br&gt;Jazzy is licened under the LGPL&lt;br&gt;Java is a registered trademark of Sun Microsystems.&lt;br&gt;&lt;hr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1938"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1931"/>
         <source>toolBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2000"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1993"/>
         <source>Quota:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2013"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2006"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2018"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2011"/>
         <source>  Search:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2199"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2256"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2192"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2249"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2200"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2257"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2193"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2250"/>
         <source>Connect to Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2260"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2253"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2261"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2254"/>
         <source>Disconnect from Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3163"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3134"/>
         <source>This will cause all notes &amp; attachments to be reindexed, but please be aware that depending upon the size of your database updating all these records can be time consuming and NeverNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3170"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3141"/>
         <source>Marking notes for reindex.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3144"/>
         <source>Database will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3185"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3156"/>
         <source>Notes will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3187"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3158"/>
         <source>Note will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3202"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
         <source>Delete selected note(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3616"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3597"/>
+        <source>Error Saving Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3619"/>
         <source>Note has never been synchronized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3617"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3620"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3617"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3620"/>
         <source>This note has never been sent to Evernote, so there is no history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3621"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3624"/>
         <source>Getting Note History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3638"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3641"/>
         <source>Note not found on server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3662"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3665"/>
         <source>History retrieved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3720"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3723"/>
         <source>Restoring as new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3722"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3725"/>
         <source>Note has been restored as a new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3726"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3729"/>
         <source>Restoring note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3738"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3741"/>
         <source>Note has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4069"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4072"/>
         <source>DOUGH!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4078"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4081"/>
         <source>Well, this is embarrassing.
 
 Some attachments or images for this note appear to be missing from my database.
@@ -237,97 +242,97 @@ Who knows, you might get lucky.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4121"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4124"/>
         <source>Finalizing Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4154"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4142"/>
         <source>Synchronization Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4257"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4239"/>
         <source>Index completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4271"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4281"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4253"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4263"/>
         <source>Indexing notes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4295"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4277"/>
         <source>Indexing is now enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4297"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4279"/>
         <source>Indexing is now disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4312"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4320"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4328"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4336"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4343"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4350"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4294"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4302"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4310"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4318"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4325"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4332"/>
         <source>A thread his died.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4313"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4295"/>
         <source>It appears as the tag counter thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4321"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4303"/>
         <source>It appears as the notebook counter thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4337"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4319"/>
         <source>It appears as the note saver thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4344"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4326"/>
         <source>It appears as the synchronization thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4333"/>
         <source>It appears as the index thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4368"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4441"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4350"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4423"/>
         <source>Backup Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4369"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4410"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4442"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4475"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4392"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4424"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4457"/>
         <source>NeverNote Export (*.nnex);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4378"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4360"/>
         <source>Backing up database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4388"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4370"/>
         <source>Database backup completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4399"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4381"/>
         <source>This is used to restore a database from backups.
 It is HIGHLY recommened that this only be used to populate
 an empty database.  Restoring into a database that
@@ -337,37 +342,37 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4409"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4391"/>
         <source>Restore Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4419"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4401"/>
         <source>Restoring database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4433"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4415"/>
         <source>Database has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4451"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4433"/>
         <source>Exporting Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4463"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4445"/>
         <source>Export completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4474"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4456"/>
         <source>Import Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4512"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4494"/>
         <source>Notes have been imported.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -398,72 +403,77 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.ConfigAppearancePage</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="76"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="77"/>
         <source>GUI Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="82"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="83"/>
         <source>Use standard palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="92"/>
         <source>Tag Behavior</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="93"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="94"/>
         <source>Do nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="94"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="95"/>
         <source>Count tags &amp; do not hide inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="95"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="96"/>
         <source>Count tags &amp; hide inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="96"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="97"/>
         <source>Color active tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="105"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="106"/>
         <source>Date/Time Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="121"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="122"/>
         <source>Mimic Evernote Selection Behavior (Requires Restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="122"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="123"/>
         <source>Show Splash Screen on Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="123"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="124"/>
         <source>Show Tray Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="124"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="125"/>
         <source>Verify Deletes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="125"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="126"/>
         <source>Display PDF Documents Inline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="128"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="127"/>
+        <source>Create New Notes With Selected Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="130"/>
         <source>Automatic Save Interval (in Minutes)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -572,32 +582,32 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="228"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="233"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="234"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="239"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="240"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="245"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="246"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="251"/>
         <source>Hide Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="252"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="257"/>
         <source>Hide Edit Buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="258"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="263"/>
         <source>Debugging</source>
         <translation type="unfinished"></translation>
     </message>
@@ -974,6 +984,11 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/EnCryptDialog.java" line="74"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/cx/fbn/nevernote/dialog/EnCryptDialog.java" line="120"/>
         <source>Password must be at least 4 characters</source>
         <translation type="unfinished"></translation>
@@ -1269,6 +1284,26 @@ Are you sure you want to continue?</source>
         <source>Add a search</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="48"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="51"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="57"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="60"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.dialog.TableDialog</name>
@@ -1367,49 +1402,49 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.WatchFolder</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="58"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="59"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="62"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="63"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="70"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="71"/>
         <source>Auto Import Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="74"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="75"/>
         <source>Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="75"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="76"/>
         <source>Target Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="76"/>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="167"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="77"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="168"/>
         <source>Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="87"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="88"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="92"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="96"/>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="170"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="97"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="171"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1458,235 +1493,287 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>cx.fbn.nevernote.gui.AttributeTreeWidget</name>
+    <name>cx.fbn.nevernote.filters.ContainsAttributeFilter</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="32"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="35"/>
-        <source>Attributes</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="36"/>
+        <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="40"/>
-        <source>Created</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="39"/>
+        <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="46"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="96"/>
-        <source>Since</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="42"/>
+        <source>Ink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="78"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="109"/>
-        <source>Before</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="45"/>
+        <source>Encrypted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="90"/>
-        <source>Last Modified</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="48"/>
+        <source>ToDo Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="121"/>
-        <source>Contains</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="51"/>
+        <source>Unfinished to-do items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="124"/>
-        <source>Images</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="54"/>
+        <source>Finished to-do items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="129"/>
-        <source>Audio</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="57"/>
+        <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="134"/>
-        <source>Ink</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="60"/>
+        <source>PDF</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>cx.fbn.nevernote.filters.DateAttributeFilter</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="139"/>
-        <source>Encrypted Text</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="71"/>
+        <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="145"/>
-        <source>To-Do Items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="91"/>
+        <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="150"/>
-        <source>Unfinished to-do items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="112"/>
+        <source>This Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="155"/>
-        <source>Finished to-do items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="133"/>
+        <source>Last Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="160"/>
-        <source>Attachment</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="161"/>
+        <source>This Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="165"/>
-        <source>PDF</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="193"/>
+        <source>Last Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="216"/>
+        <source>This Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="240"/>
+        <source>Last Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>cx.fbn.nevernote.gui.AttributeTreeWidget</name>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="37"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="40"/>
+        <source>Attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="45"/>
+        <source>Created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="52"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="97"/>
+        <source>Since</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="77"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="111"/>
+        <source>Before</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="90"/>
+        <source>Last Modified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="124"/>
+        <source>Contains</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.gui.BrowserWindow</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="232"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="233"/>
         <source>Subject Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="239"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="240"/>
         <source>Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="240"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="241"/>
         <source>Created:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="249"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="250"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="250"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="251"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="251"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="252"/>
         <source>View On Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="321"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="322"/>
         <source>Undo Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="322"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="323"/>
         <source>Redo Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="323"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="324"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="324"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="325"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="325"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="326"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="326"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="327"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="327"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="328"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="328"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="329"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="330"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="331"/>
         <source>Right Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="331"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="332"/>
         <source>Left Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="332"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="333"/>
         <source>Center Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="334"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="335"/>
         <source>Strikethrough</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="335"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="336"/>
         <source>Insert Horizontal Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="336"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="337"/>
         <source>Shift Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="337"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="338"/>
         <source>Shift Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="338"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="339"/>
         <source>Bullet List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="339"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="340"/>
         <source>Number List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="394"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="395"/>
         <source>Font Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="399"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="400"/>
         <source>Font Hilight Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="514"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="516"/>
         <source>Source URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="567"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="570"/>
         <source>Source URL:    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="572"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="581"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="582"/>
+        <source>http://</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="590"/>
         <source>Author:        </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="695"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="713"/>
         <source>Unable Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="697"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="715"/>
         <source>This is an ink note.
 Ink notes are not supported since Evernote has not
  published any specifications on them
@@ -1694,54 +1781,54 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1108"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1108"/>
         <source>Error Encrypting String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1462"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1469"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1504"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1511"/>
         <source>Untitled Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1799"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1845"/>
         <source>Non-premium accounts can only attach JPG, PNG, GIF, MP3, WAV, AMR, or PDF files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1800"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1846"/>
         <source>Non-Premium Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1819"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1865"/>
         <source>A file attachment may not exceed 25MB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1820"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1866"/>
         <source>Attachment Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1906"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1958"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1953"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2005"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2076"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2122"/>
         <source>Insert Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2170"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2216"/>
         <source>Edit Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2308,107 +2395,115 @@ and I&apos;m too lazy to figure them out by myself.</source>
 <context>
     <name>cx.fbn.nevernote.gui.TableView</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="96"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="92"/>
         <source>Date Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="97"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="93"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="98"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="94"/>
         <source>Guid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="99"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="95"/>
         <source>Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="100"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="96"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="101"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="97"/>
         <source>Date Changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="102"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="98"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="103"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="99"/>
         <source>Source Url</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="104"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="100"/>
         <source>Subject Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="105"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="101"/>
         <source>Synchronized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="373"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="316"/>
         <source>Title Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="385"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="328"/>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="386"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="329"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="387"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="330"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="388"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="331"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="389"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="332"/>
         <source>Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="390"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="333"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="391"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="334"/>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="392"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="335"/>
         <source>Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="393"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="336"/>
         <source>Magenta</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>cx.fbn.nevernote.gui.TagTreeWidget</name>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/TagTreeWidget.java" line="64"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>cx.fbn.nevernote.threads.SyncRunner</name>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="237"/>
@@ -2459,24 +2554,24 @@ and I&apos;m too lazy to figure them out by myself.</source>
     </message>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="457"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="535"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="565"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="570"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="575"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="654"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="659"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="664"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="747"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="752"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="757"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="532"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="562"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="567"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="572"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="651"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="656"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="661"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="744"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="749"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="754"/>
         <source>Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="467"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="530"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="540"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="545"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="527"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="537"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="542"/>
         <source>Error sending local note: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2486,32 +2581,32 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="558"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="555"/>
         <source>Sending local notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="647"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="644"/>
         <source>Sending local tags.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="740"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="737"/>
         <source>Sending saved searches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="843"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="840"/>
         <source>Downloading 0% complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="928"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="925"/>
         <source>Downloading </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="928"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="925"/>
         <source>% complete.</source>
         <translation type="unfinished"></translation>
     </message>
index ac39937..c0ac6da 100644 (file)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1080"/>
         <source>Edit Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1150"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1140"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>Unable to Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1141"/>
         <source>Some of the selected notebook(s) contain notes.
 Please delete the notes or move them to another notebook before deleting any notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>You must have at least one notebook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1357"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1796"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3202"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4395"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1348"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1789"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3132"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4377"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
         <source>Delete the selected notebooks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1357"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1348"/>
         <source>Delete the selected tags?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1605"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1598"/>
         <source>Edit Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1798"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1791"/>
         <source>This will free unused space in the database, but please be aware that depending upon the size of your database this can be time consuming and NeverNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1831"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1824"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1847"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1840"/>
         <source>Mesasge Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1856"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1849"/>
         <source>About NeverNote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1858"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1851"/>
         <source>&lt;h4&gt;&lt;center&gt;&lt;b&gt;NeverNote&lt;/b&gt;&lt;/center&gt;&lt;/h4&gt;&lt;hr&gt;&lt;center&gt;Version </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1866"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1859"/>
         <source>&lt;hr&gt;&lt;/center&gt;Evernote Generic client.&lt;br&gt;&lt;br&gt;Licensed under GPL v2.  &lt;br&gt;&lt;hr&gt;&lt;br&gt;Evernote is copyright 2001-2010 by Evernote Corporation&lt;br&gt;Jambi and QT are the licensed trademark of Nokia Corporation&lt;br&gt;PDFRenderer is licened under the LGPL&lt;br&gt;Jazzy is licened under the LGPL&lt;br&gt;Java is a registered trademark of Sun Microsystems.&lt;br&gt;&lt;hr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1938"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1931"/>
         <source>toolBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2000"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1993"/>
         <source>Quota:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2013"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2006"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2018"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2011"/>
         <source>  Search:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2199"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2256"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2192"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2249"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2200"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2257"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2193"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2250"/>
         <source>Connect to Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2260"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2253"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2261"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2254"/>
         <source>Disconnect from Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3163"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3134"/>
         <source>This will cause all notes &amp; attachments to be reindexed, but please be aware that depending upon the size of your database updating all these records can be time consuming and NeverNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3170"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3141"/>
         <source>Marking notes for reindex.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3144"/>
         <source>Database will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3185"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3156"/>
         <source>Notes will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3187"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3158"/>
         <source>Note will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3202"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3173"/>
         <source>Delete selected note(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3616"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3597"/>
+        <source>Error Saving Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3619"/>
         <source>Note has never been synchronized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3617"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3620"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3617"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3620"/>
         <source>This note has never been sent to Evernote, so there is no history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3621"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3624"/>
         <source>Getting Note History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3638"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3641"/>
         <source>Note not found on server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3662"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3665"/>
         <source>History retrieved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3720"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3723"/>
         <source>Restoring as new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3722"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3725"/>
         <source>Note has been restored as a new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3726"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3729"/>
         <source>Restoring note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3738"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3741"/>
         <source>Note has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4069"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4072"/>
         <source>DOUGH!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4078"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4081"/>
         <source>Well, this is embarrassing.
 
 Some attachments or images for this note appear to be missing from my database.
@@ -237,97 +242,97 @@ Who knows, you might get lucky.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4121"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4124"/>
         <source>Finalizing Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4154"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4142"/>
         <source>Synchronization Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4257"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4239"/>
         <source>Index completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4271"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4281"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4253"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4263"/>
         <source>Indexing notes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4295"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4277"/>
         <source>Indexing is now enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4297"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4279"/>
         <source>Indexing is now disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4312"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4320"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4328"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4336"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4343"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4350"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4294"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4302"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4310"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4318"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4325"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4332"/>
         <source>A thread his died.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4313"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4295"/>
         <source>It appears as the tag counter thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4321"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4303"/>
         <source>It appears as the notebook counter thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4337"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4319"/>
         <source>It appears as the note saver thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4344"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4326"/>
         <source>It appears as the synchronization thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4333"/>
         <source>It appears as the index thread has died.  I recommend checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4368"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4441"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4350"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4423"/>
         <source>Backup Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4369"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4410"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4442"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4475"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4392"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4424"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4457"/>
         <source>NeverNote Export (*.nnex);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4378"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4360"/>
         <source>Backing up database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4388"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4370"/>
         <source>Database backup completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4399"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4381"/>
         <source>This is used to restore a database from backups.
 It is HIGHLY recommened that this only be used to populate
 an empty database.  Restoring into a database that
@@ -337,37 +342,37 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4409"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4391"/>
         <source>Restore Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4419"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4401"/>
         <source>Restoring database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4433"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4415"/>
         <source>Database has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4451"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4433"/>
         <source>Exporting Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4463"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4445"/>
         <source>Export completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4474"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4456"/>
         <source>Import Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4512"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4494"/>
         <source>Notes have been imported.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -398,72 +403,77 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.ConfigAppearancePage</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="76"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="77"/>
         <source>GUI Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="82"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="83"/>
         <source>Use standard palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="92"/>
         <source>Tag Behavior</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="93"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="94"/>
         <source>Do nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="94"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="95"/>
         <source>Count tags &amp; do not hide inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="95"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="96"/>
         <source>Count tags &amp; hide inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="96"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="97"/>
         <source>Color active tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="105"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="106"/>
         <source>Date/Time Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="121"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="122"/>
         <source>Mimic Evernote Selection Behavior (Requires Restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="122"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="123"/>
         <source>Show Splash Screen on Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="123"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="124"/>
         <source>Show Tray Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="124"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="125"/>
         <source>Verify Deletes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="125"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="126"/>
         <source>Display PDF Documents Inline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="128"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="127"/>
+        <source>Create New Notes With Selected Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java" line="130"/>
         <source>Automatic Save Interval (in Minutes)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -572,32 +582,32 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="228"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="233"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="234"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="239"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="240"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="245"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="246"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="251"/>
         <source>Hide Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="252"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="257"/>
         <source>Hide Edit Buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="258"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="263"/>
         <source>Debugging</source>
         <translation type="unfinished"></translation>
     </message>
@@ -974,6 +984,11 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/EnCryptDialog.java" line="74"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/cx/fbn/nevernote/dialog/EnCryptDialog.java" line="120"/>
         <source>Password must be at least 4 characters</source>
         <translation type="unfinished"></translation>
@@ -1269,6 +1284,26 @@ Are you sure you want to continue?</source>
         <source>Add a search</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="48"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="51"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="57"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/SavedSearchEdit.java" line="60"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.dialog.TableDialog</name>
@@ -1367,49 +1402,49 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.WatchFolder</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="58"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="59"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="62"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="63"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="70"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="71"/>
         <source>Auto Import Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="74"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="75"/>
         <source>Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="75"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="76"/>
         <source>Target Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="76"/>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="167"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="77"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="168"/>
         <source>Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="87"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="88"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="92"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="96"/>
-        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="170"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="97"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/WatchFolder.java" line="171"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1458,235 +1493,287 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>cx.fbn.nevernote.gui.AttributeTreeWidget</name>
+    <name>cx.fbn.nevernote.filters.ContainsAttributeFilter</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="32"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="35"/>
-        <source>Attributes</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="36"/>
+        <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="40"/>
-        <source>Created</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="39"/>
+        <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="46"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="96"/>
-        <source>Since</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="42"/>
+        <source>Ink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="78"/>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="109"/>
-        <source>Before</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="45"/>
+        <source>Encrypted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="90"/>
-        <source>Last Modified</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="48"/>
+        <source>ToDo Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="121"/>
-        <source>Contains</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="51"/>
+        <source>Unfinished to-do items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="124"/>
-        <source>Images</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="54"/>
+        <source>Finished to-do items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="129"/>
-        <source>Audio</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="57"/>
+        <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="134"/>
-        <source>Ink</source>
+        <location filename="../src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java" line="60"/>
+        <source>PDF</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>cx.fbn.nevernote.filters.DateAttributeFilter</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="139"/>
-        <source>Encrypted Text</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="71"/>
+        <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="145"/>
-        <source>To-Do Items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="91"/>
+        <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="150"/>
-        <source>Unfinished to-do items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="112"/>
+        <source>This Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="155"/>
-        <source>Finished to-do items</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="133"/>
+        <source>Last Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="160"/>
-        <source>Attachment</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="161"/>
+        <source>This Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="165"/>
-        <source>PDF</source>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="193"/>
+        <source>Last Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="216"/>
+        <source>This Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java" line="240"/>
+        <source>Last Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>cx.fbn.nevernote.gui.AttributeTreeWidget</name>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="37"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="40"/>
+        <source>Attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="45"/>
+        <source>Created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="52"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="97"/>
+        <source>Since</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="77"/>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="111"/>
+        <source>Before</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="90"/>
+        <source>Last Modified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/AttributeTreeWidget.java" line="124"/>
+        <source>Contains</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.gui.BrowserWindow</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="232"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="233"/>
         <source>Subject Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="239"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="240"/>
         <source>Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="240"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="241"/>
         <source>Created:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="249"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="250"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="250"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="251"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="251"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="252"/>
         <source>View On Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="321"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="322"/>
         <source>Undo Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="322"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="323"/>
         <source>Redo Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="323"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="324"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="324"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="325"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="325"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="326"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="326"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="327"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="327"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="328"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="328"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="329"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="330"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="331"/>
         <source>Right Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="331"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="332"/>
         <source>Left Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="332"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="333"/>
         <source>Center Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="334"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="335"/>
         <source>Strikethrough</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="335"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="336"/>
         <source>Insert Horizontal Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="336"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="337"/>
         <source>Shift Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="337"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="338"/>
         <source>Shift Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="338"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="339"/>
         <source>Bullet List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="339"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="340"/>
         <source>Number List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="394"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="395"/>
         <source>Font Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="399"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="400"/>
         <source>Font Hilight Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="514"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="516"/>
         <source>Source URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="567"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="570"/>
         <source>Source URL:    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="572"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="581"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="582"/>
+        <source>http://</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="590"/>
         <source>Author:        </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="695"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="713"/>
         <source>Unable Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="697"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="715"/>
         <source>This is an ink note.
 Ink notes are not supported since Evernote has not
  published any specifications on them
@@ -1694,54 +1781,54 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1108"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1108"/>
         <source>Error Encrypting String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1462"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1469"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1504"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1511"/>
         <source>Untitled Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1799"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1845"/>
         <source>Non-premium accounts can only attach JPG, PNG, GIF, MP3, WAV, AMR, or PDF files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1800"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1846"/>
         <source>Non-Premium Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1819"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1865"/>
         <source>A file attachment may not exceed 25MB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1820"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1866"/>
         <source>Attachment Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1906"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1958"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1953"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2005"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2076"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2122"/>
         <source>Insert Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2170"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2216"/>
         <source>Edit Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2308,107 +2395,115 @@ and I&apos;m too lazy to figure them out by myself.</source>
 <context>
     <name>cx.fbn.nevernote.gui.TableView</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="96"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="92"/>
         <source>Date Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="97"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="93"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="98"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="94"/>
         <source>Guid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="99"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="95"/>
         <source>Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="100"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="96"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="101"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="97"/>
         <source>Date Changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="102"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="98"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="103"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="99"/>
         <source>Source Url</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="104"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="100"/>
         <source>Subject Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="105"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="101"/>
         <source>Synchronized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="373"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="316"/>
         <source>Title Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="385"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="328"/>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="386"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="329"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="387"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="330"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="388"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="331"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="389"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="332"/>
         <source>Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="390"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="333"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="391"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="334"/>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="392"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="335"/>
         <source>Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="393"/>
+        <location filename="../src/cx/fbn/nevernote/gui/TableView.java" line="336"/>
         <source>Magenta</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>cx.fbn.nevernote.gui.TagTreeWidget</name>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/TagTreeWidget.java" line="64"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>cx.fbn.nevernote.threads.SyncRunner</name>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="237"/>
@@ -2459,24 +2554,24 @@ and I&apos;m too lazy to figure them out by myself.</source>
     </message>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="457"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="535"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="565"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="570"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="575"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="654"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="659"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="664"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="747"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="752"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="757"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="532"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="562"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="567"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="572"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="651"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="656"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="661"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="744"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="749"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="754"/>
         <source>Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="467"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="530"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="540"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="545"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="527"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="537"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="542"/>
         <source>Error sending local note: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2486,32 +2581,32 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="558"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="555"/>
         <source>Sending local notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="647"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="644"/>
         <source>Sending local tags.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="740"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="737"/>
         <source>Sending saved searches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="843"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="840"/>
         <source>Downloading 0% complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="928"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="925"/>
         <source>Downloading </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="928"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="925"/>
         <source>% complete.</source>
         <translation type="unfinished"></translation>
     </message>
index beb495f..11f659a 100644 (file)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1090"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1080"/>
         <source>Edit Notebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1150"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1140"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>Unable to Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1151"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1141"/>
         <source>Some of the selected notebook(s) contain notes.
 Please delete the notes or move them to another notebook before deleting any notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1156"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
         <source>You must have at least one notebook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1357"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1796"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3161"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3202"/>
-      &n