From: yuki Date: Wed, 11 Sep 2013 03:34:50 +0000 (+0900) Subject: Merge branch 'develop' X-Git-Tag: version0.3^0 X-Git-Url: http://git.sourceforge.jp/view?p=neighbornote%2FNeighborNote.git;a=commitdiff_plain;h=d9a3e9fe7786510964989afb7dcbbc708f67be18;hp=190ad986c47eee9b928b9e4ebbfc6fd45c7e155c Merge branch 'develop' --- diff --git a/.classpath b/.classpath index 1fe293f..f45324d 100644 --- a/.classpath +++ b/.classpath @@ -3,7 +3,6 @@ - @@ -25,8 +24,12 @@ - - - + + + + + + + diff --git a/lib/h2-1.3.158.jar b/lib/h2-1.3.158.jar deleted file mode 100644 index b62b456..0000000 Binary files a/lib/h2-1.3.158.jar and /dev/null differ diff --git a/lib/h2-1.3.163.jar b/lib/h2-1.3.163.jar new file mode 100644 index 0000000..ea557bd Binary files /dev/null and b/lib/h2-1.3.163.jar differ diff --git a/lib/h2-lucene-ex-1.3.163.jar b/lib/h2-lucene-ex-1.3.163.jar new file mode 100644 index 0000000..a1683dc Binary files /dev/null and b/lib/h2-lucene-ex-1.3.163.jar differ diff --git a/lib/lucene-analyzers-3.6.2.jar b/lib/lucene-analyzers-3.6.2.jar new file mode 100644 index 0000000..752c714 Binary files /dev/null and b/lib/lucene-analyzers-3.6.2.jar differ diff --git a/lib/lucene-core-3.6.2.jar b/lib/lucene-core-3.6.2.jar new file mode 100644 index 0000000..bdc96ab Binary files /dev/null and b/lib/lucene-core-3.6.2.jar differ diff --git a/neighbornote-osx b/neighbornote-osx index 56475de..879aeda 100644 --- a/neighbornote-osx +++ b/neighbornote-osx @@ -92,7 +92,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-compress-1.2.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-lang3-3.0.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-logging-1.1.1.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/evernote-api-1.25.0.jar -NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.158.jar +NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.163.jar +NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-lucene-ex-1.3.163.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpclient-4.1.1.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpcore-4.1.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpmime-4.1.1.jar @@ -101,6 +102,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jazzy.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jtidy-r938.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/libthrift.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/log4j-1.2.14.jar +NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNTOE/lib/lucene-analyzers-3.6.2.jar +NN_CLASSPATH=$NN_CLASSPATH;$NEIGHBORNOTE/lib/lucene-core-3.6.2.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/pdfbox-app-1.6.0.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-3.7-20101029.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-ooxml-3.7.jar diff --git a/neighbornote.bat b/neighbornote.bat index 2f9ec91..b7303d8 100755 --- a/neighbornote.bat +++ b/neighbornote.bat @@ -85,7 +85,8 @@ set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-compress-1.2.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-lang3-3.0.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-logging-1.1.1.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\evernote-api-1.25.0.jar -set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\h2-1.3.158.jar +set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\h2-1.3.163.jar +set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\h2-lucene-ex-1.3.163.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpclient-4.1.1.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpcore-4.1.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpmime-4.1.1.jar @@ -94,6 +95,8 @@ set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\jazzy.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\jtidy-r938.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\libthrift.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\log4j-1.2.14.jar +set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\lucene-analyzers-3.6.2.jar +set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\lucene-core-3.6.2.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\pdfbox-app-1.6.0.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\poi-3.7-20101029.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\poi-ooxml-3.7.jar diff --git a/neighbornote.sh b/neighbornote.sh index a72d7d2..b0dcc05 100644 --- a/neighbornote.sh +++ b/neighbornote.sh @@ -87,7 +87,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-compress-1.2.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-lang3-3.0.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-logging-1.1.1.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/evernote-api-1.25.0.jar -NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.158.jar +NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.163.jar +NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-lucene-ex-1.3.163.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpclient-4.1.1.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpcore-4.1.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpmime-4.1.1.jar @@ -96,6 +97,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jazzy.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jtidy-r938.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/libthrift.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/log4j-1.2.14.jar +NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/lucene-analyzers-3.6.2.jar +NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/lucene-core-3.6.2.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/scribe-1.3.0.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/pdfbox-app-1.6.0.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-3.7-20101029.jar diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java index 544d3cf..b6e0e4b 100644 --- a/src/cx/fbn/nevernote/Global.java +++ b/src/cx/fbn/nevernote/Global.java @@ -53,6 +53,8 @@ import cx.fbn.nevernote.config.StartupConfig; import cx.fbn.nevernote.gui.ContainsAttributeFilterTable; import cx.fbn.nevernote.gui.DateAttributeFilterTable; import cx.fbn.nevernote.gui.ShortcutKeys; +import cx.fbn.nevernote.sql.DatabaseConnection; +import cx.fbn.nevernote.sql.driver.NSqlQuery; import cx.fbn.nevernote.utilities.ApplicationLogger; import cx.fbn.nevernote.utilities.Pair; @@ -67,8 +69,8 @@ import cx.fbn.nevernote.utilities.Pair; public class Global { // Set current version and the known versions. // ICHANGED 自分用に変更 - public static String version = "0.2"; - public static String[] validVersions = {"0.2", "0.1.3", "0.1.2", "0.1.1", "0.1"}; + public static String version = "0.3"; + public static String[] validVersions = {"0.3", "0.2", "0.1.3", "0.1.2", "0.1.1", "0.1"}; public static String username = ""; //public static String password = ""; @@ -139,7 +141,7 @@ public class Global { //public static int minimumWordCount = 2; // Regular expression to parse text with when indexing - private static String wordRegex; +// private static String wordRegex; // Experimental fixes. Set via Edit/Preferences/Debugging public static boolean enableCarriageReturnFix = false; @@ -221,10 +223,10 @@ public class Global { getServer(); // Setup URL to connect to // Get regular expressions used to parse out words - settings.beginGroup("General"); - String regex = (String) settings.value("regex", "[,\\s]+"); - setWordRegex(regex); - settings.endGroup(); +// settings.beginGroup("General"); +// String regex = (String) settings.value("regex", "[,\\s]+"); +// setWordRegex(regex); +// settings.endGroup(); //Setup debugging information settings.beginGroup("Debug"); @@ -251,12 +253,12 @@ public class Global { } // Get/Set word parsing regular expression - public static String getWordRegex() { - return wordRegex; - } - public static void setWordRegex(String r) { - wordRegex = r; - } +// public static String getWordRegex() { +// return wordRegex; +// } +// public static void setWordRegex(String r) { +// wordRegex = r; +// } // Set the debug message level public static void setMessageLevel(String msglevel) { @@ -1880,18 +1882,18 @@ public class Global { settings.endGroup(); } // Get/Set characters that shouldn't be removed from a word - public static String getSpecialIndexCharacters() { - settings.beginGroup("Index"); - String text = (String)settings.value("specialCharacters", ""); - settings.endGroup(); - return text; - } - public static void setSpecialIndexCharacters(String value) { - settings.beginGroup("Index"); - settings.setValue("specialCharacters", value); - settings.endGroup(); - databaseCache = value; - } +// public static String getSpecialIndexCharacters() { +// settings.beginGroup("Index"); +// String text = (String)settings.value("specialCharacters", ""); +// settings.endGroup(); +// return text; +// } +// public static void setSpecialIndexCharacters(String value) { +// settings.beginGroup("Index"); +// settings.setValue("specialCharacters", value); +// settings.endGroup(); +// databaseCache = value; +// } //***************************************************************************** // Control how tag selection behaves (should they be "and" or "or" selections @@ -2018,27 +2020,27 @@ public class Global { } // If we should automatically wildcard searches - public static boolean automaticWildcardSearches() { - settings.beginGroup("General"); - try { - String value = (String)settings.value("automaticWildcard", "false"); - settings.endGroup(); - if (value.equals("true")) - return true; - else - return false; - } catch (java.lang.ClassCastException e) { - Boolean value = (Boolean) settings.value("automaticWildcard", false); - settings.endGroup(); - return value; - } - - } - public static void setAutomaticWildcardSearches(boolean value) { - settings.beginGroup("General"); - settings.setValue("automaticWildcard", value); - settings.endGroup(); - } +// public static boolean automaticWildcardSearches() { +// settings.beginGroup("General"); +// try { +// String value = (String)settings.value("automaticWildcard", "false"); +// settings.endGroup(); +// if (value.equals("true")) +// return true; +// else +// return false; +// } catch (java.lang.ClassCastException e) { +// Boolean value = (Boolean) settings.value("automaticWildcard", false); +// settings.endGroup(); +// return value; +// } +// +// } +// public static void setAutomaticWildcardSearches(boolean value) { +// settings.beginGroup("General"); +// settings.setValue("automaticWildcard", value); +// settings.endGroup(); +// } // If we should automatically select the children of any tag public static boolean displayRightToLeft() { @@ -2139,11 +2141,11 @@ public class Global { settings.beginGroup("RensoNoteList"); Integer value; try { - String val = (String)settings.value("addNewNoteWeight", 1); + String val = (String)settings.value("addNewNoteWeight", 3); value = new Integer(val.trim()); } catch (Exception e) { try { - value = (Integer)settings.value("addNewNoteWeight", 1); + value = (Integer)settings.value("addNewNoteWeight", 3); } catch (Exception e1) { value = 1; } @@ -2234,11 +2236,11 @@ public class Global { settings.beginGroup("RensoNoteList"); Integer value; try { - String val = (String)settings.value("enRelatedNotesWeight", 10); + String val = (String)settings.value("enRelatedNotesWeight", 5); value = new Integer(val.trim()); } catch (Exception e) { try { - value = (Integer)settings.value("enRelatedNotesWeight", 10); + value = (Integer)settings.value("enRelatedNotesWeight", 5); } catch (Exception e1) { value = 10; } @@ -2345,5 +2347,271 @@ public class Global { settings.endGroup(); return value; } + + // タグを排除してプレーンテキストを抽出 + public static String extractPlainText(String sourceText) { + String plainText = sourceText.replaceAll("<.+?>", ""); // タグを除去 + plainText = plainText.replaceAll("\\s{2,}", " "); // 2個以上の空白文字を1文字の空白に変換 + String kaigyo = System.getProperty("line.separator"); + plainText = plainText.replaceAll(kaigyo, ""); // 改行を除去 +// plainText = plainText.replaceAll("<.+?>", ""); // <で始まり>で終わる文字列を除去 + + // HTML特殊文字のサニタイジングを解除 + plainText = plainText.replaceAll("'", "'"); + plainText = plainText.replaceAll(""", "\""); + plainText = plainText.replaceAll(">", ">"); + plainText = plainText.replaceAll("<", "<"); + plainText = plainText.replaceAll("&", "&"); + + plainText = plainText.replaceAll("&.+?;", ""); // その他HTML特殊文字があれば除去 + + return plainText; + } + + // 全文検索機能の対象となるテーブルとカラムを再構築 + public static boolean rebuildFullTextNoteTarget(DatabaseConnection dbConn) { + NSqlQuery nQuery = new NSqlQuery(dbConn.getConnection()); + StringBuilder noteTableTarget = new StringBuilder(); + boolean success = true; + + if (Global.indexNoteBody()) { + noteTableTarget.append("CONTENTTEXT"); + } + if (Global.indexNoteTitle()) { + if (noteTableTarget.length() > 0) { + noteTableTarget.append(", "); + } + noteTableTarget.append("TITLE"); + } + + if (noteTableTarget.length() > 0) { + nQuery.prepare("CALL FTL_CREATE_INDEX('PUBLIC', 'NOTE', :column);"); + nQuery.bindValue(":column", noteTableTarget.toString()); + if (!nQuery.exec()) { + success = false; + } + } + + return success; + } + + public static boolean rebuildFullTextResourceTarget(DatabaseConnection dbConn) { + NSqlQuery rQuery = new NSqlQuery(dbConn.getResourceConnection()); + StringBuilder resourceTableTarget = new StringBuilder(); + boolean success = true; + + if (Global.indexAttachmentsLocally()) { + resourceTableTarget.append("RESOURCETEXT"); + } + + if (resourceTableTarget.length() > 0) { + rQuery.prepare("CALL FTL_CREATE_INDEX('PUBLIC', 'NOTERESOURCES', :column);"); + rQuery.bindValue(":column", resourceTableTarget.toString()); + if (!rQuery.exec()) { + success = false; + } + } + + return success; + } + + // 操作ログを取らないモードのボタン状態 + public static boolean isHaltLogButton() { + settings.beginGroup("RensoNoteList"); + try { + String text = (String)settings.value("haltOperationLog", "false"); + settings.endGroup(); + if (text.equalsIgnoreCase("true")) + return true; + else + return false; + } catch (java.lang.ClassCastException e) { + Boolean value = (Boolean) settings.value("haltOperationLog", true); + settings.endGroup(); + return value; + } + } + public static void saveHaltLogButton(boolean val) { + settings.beginGroup("RensoNoteList"); + if (val) + settings.setValue("haltOperationLog", "true"); + else + settings.setValue("haltOperationLog", "false"); + settings.endGroup(); + } + + // 連想ノートリストの重み付けモードの状態 + public static String rensoWeightingSelect() { + settings.beginGroup("RensoNoteList"); + String text = (String)settings.value("rensoWeightingSelect", "Standard"); + settings.endGroup(); + return text; + } + public static void saveRensoWeightingSelect(String val) { + settings.beginGroup("RensoNoteList"); + settings.setValue("rensoWeightingSelect", val); + settings.endGroup(); + } + + //ordinal から指定した Enum の要素に変換する汎用関数 + public static > E fromOrdinal(Class enumClass, int ordinal) { + E[] enumArray = enumClass.getEnumConstants(); + return enumArray[ordinal]; + } + + // 連想ノートリスト重み付けモード：カスタムの設定値（同時閲覧） + public static int customBrowseWeight() { + settings.beginGroup("RensoNoteList"); + Integer value; + try { + String val = (String)settings.value("customBrowseWeight", 1); + value = new Integer(val.trim()); + } catch (Exception e) { + try { + value = (Integer)settings.value("customBrowseWeight", 1); + } catch (Exception e1) { + value = 1; + } + } + settings.endGroup(); + return value; + } + public static void saveCustomBrowseWeight(int weight) { + settings.beginGroup("RensoNoteList"); + settings.setValue("customBrowseWeight", weight); + settings.endGroup(); + } + // 連想ノートリスト重み付けモード：カスタムの設定値（コピー＆ペースト） + public static int customCopyPasteWeight() { + settings.beginGroup("RensoNoteList"); + Integer value; + try { + String val = (String)settings.value("customCopyPasteWeight", 3); + value = new Integer(val.trim()); + } catch (Exception e) { + try { + value = (Integer)settings.value("customCopyPasteWeight", 3); + } catch (Exception e1) { + value = 3; + } + } + settings.endGroup(); + return value; + } + public static void saveCustomCopyPasteWeight(int weight) { + settings.beginGroup("RensoNoteList"); + settings.setValue("customCopyPasteWeight", weight); + settings.endGroup(); + } + // 連想ノートリスト重み付けモード：カスタムの設定値（新規ノート追加） + public static int customAddNewNoteWeight() { + settings.beginGroup("RensoNoteList"); + Integer value; + try { + String val = (String)settings.value("customAddNewNoteWeight", 3); + value = new Integer(val.trim()); + } catch (Exception e) { + try { + value = (Integer)settings.value("customAddNewNoteWeight", 3); + } catch (Exception e1) { + value = 3; + } + } + settings.endGroup(); + return value; + } + public static void saveCustomAddNewNoteWeight(int weight) { + settings.beginGroup("RensoNoteList"); + settings.setValue("customAddNewNoteWeight", weight); + settings.endGroup(); + } + // 連想ノートリスト重み付けモード：カスタムの設定値（連想ノートクリック） + public static int customRensoItemClickWeight() { + settings.beginGroup("RensoNoteList"); + Integer value; + try { + String val = (String)settings.value("customRensoItemClickWeight", 10); + value = new Integer(val.trim()); + } catch (Exception e) { + try { + value = (Integer)settings.value("customRensoItemClickWeight", 10); + } catch (Exception e1) { + value = 10; + } + } + settings.endGroup(); + return value; + } + public static void saveCustomRensoItemClickWeight(int weight) { + settings.beginGroup("RensoNoteList"); + settings.setValue("customRensoItemClickWeight", weight); + settings.endGroup(); + } + // 連想ノートリスト重み付けモード：カスタムの設定値（同じタグ） + public static int customSameTagWeight() { + settings.beginGroup("RensoNoteList"); + Integer value; + try { + String val = (String)settings.value("customSameTagWeight", 2); + value = new Integer(val.trim()); + } catch (Exception e) { + try { + value = (Integer)settings.value("customSameTagWeight", 2); + } catch (Exception e1) { + value = 2; + } + } + settings.endGroup(); + return value; + } + public static void saveCustomSameTagWeight(int weight) { + settings.beginGroup("RensoNoteList"); + settings.setValue("customSameTagWeight", weight); + settings.endGroup(); + } + // 連想ノートリスト重み付けモード：カスタムの設定値（同じノートブック） + public static int customSameNotebookWeight() { + settings.beginGroup("RensoNoteList"); + Integer value; + try { + String val = (String)settings.value("customSameNotebookWeight", 2); + value = new Integer(val.trim()); + } catch (Exception e) { + try { + value = (Integer)settings.value("customSameNotebookWeight", 2); + } catch (Exception e1) { + value = 2; + } + } + settings.endGroup(); + return value; + } + public static void saveCustomSameNotebookWeight(int weight) { + settings.beginGroup("RensoNoteList"); + settings.setValue("customSameNotebookWeight", weight); + settings.endGroup(); + } + // 連想ノートリスト重み付けモード：カスタムの設定値(Evernote関連ノート） + public static int customENRelatedNotesWeight() { + settings.beginGroup("RensoNoteList"); + Integer value; + try { + String val = (String)settings.value("customENRelatedNotesWeight", 5); + value = new Integer(val.trim()); + } catch (Exception e) { + try { + value = (Integer)settings.value("customENRelatedNotesWeight", 5); + } catch (Exception e1) { + value = 5; + } + } + settings.endGroup(); + return value; + } + public static void saveCustomENRelatedNotesWeight(int weight) { + settings.beginGroup("RensoNoteList"); + settings.setValue("customENRelatedNotesWeight", weight); + settings.endGroup(); + } } diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java index ff17b0d..2c73548 100644 --- a/src/cx/fbn/nevernote/NeverNote.java +++ b/src/cx/fbn/nevernote/NeverNote.java @@ -106,7 +106,6 @@ import com.trolltech.qt.gui.QComboBox; import com.trolltech.qt.gui.QCursor; import com.trolltech.qt.gui.QDesktopServices; import com.trolltech.qt.gui.QDialog; -import com.trolltech.qt.gui.QDockWidget; import com.trolltech.qt.gui.QFileDialog; import com.trolltech.qt.gui.QFileDialog.AcceptMode; import com.trolltech.qt.gui.QFileDialog.FileMode; @@ -181,6 +180,7 @@ import cx.fbn.nevernote.gui.ExternalBrowse; import cx.fbn.nevernote.gui.MainMenuBar; import cx.fbn.nevernote.gui.NotebookTreeWidget; import cx.fbn.nevernote.gui.RensoNoteList; +import cx.fbn.nevernote.gui.RensoNoteListDock; import cx.fbn.nevernote.gui.SavedSearchTreeWidget; import cx.fbn.nevernote.gui.SearchPanel; import cx.fbn.nevernote.gui.TabBrowse; @@ -329,12 +329,14 @@ public class NeverNote extends QMainWindow{ int tagDeadCount=0; // number of consecutive dead times for the tag thread int trashDeadCount=0; // number of consecutive dead times for the trash thread int saveThreadDeadCount=0; // number of consecutive dead times for the save thread + int enRelatedNotesThreadDeadCount=0; // number of consecutive dead times for the EvernoteRelatedNotes Thread boolean disableTagThreadCheck=false; boolean disableNotebookThreadCheck=false; boolean disableTrashThreadCheck=false; boolean disableSaveThreadCheck=false; boolean disableSyncThreadCheck=false; boolean disableIndexThreadCheck=false; + boolean disableENRelatedNotesThreadCheck=false; HashMap noteCache; // Cash of note content HashMap readOnlyCache; // List of cashe notes that are read-only @@ -364,8 +366,7 @@ public class NeverNote extends QMainWindow{ // ICHANGED private final TabBrowserWidget tabBrowser; // ブラウザウィンドウをタブ化 private final HashMap tabWindows; // タブウィンドウ - private final RensoNoteList rensoNoteList; // 連想ノートリスト - private final QDockWidget rensoNoteListDock; // 連想ノートリストドックウィジェット + private final RensoNoteListDock rensoNoteListDock; // 連想ノートリストドックウィジェット ClipBoardObserver cbObserver; String rensoNotePressedItemGuid; @@ -454,9 +455,9 @@ public class NeverNote extends QMainWindow{ indexThread = new QThread(indexRunner, "Index Thread"); indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally(); indexRunner.indexImageRecognition = Global.indexImageRecognition(); - indexRunner.indexNoteBody = Global.indexNoteBody(); - indexRunner.indexNoteTitle = Global.indexNoteTitle(); - indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters(); +// indexRunner.indexNoteBody = Global.indexNoteBody(); +// indexRunner.indexNoteTitle = Global.indexNoteTitle(); +// indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters(); indexThread.start(); synchronizeAnimationTimer = new QTimer(); @@ -601,11 +602,11 @@ public class NeverNote extends QMainWindow{ tabBrowser = new TabBrowserWidget(this); tabBrowser.setStyleSheet("QTabBar::tab{width:150px;}"); tabBrowser.setMovable(true); + tabBrowser.setTabsClosable(true); TabBrowse tab = new TabBrowse(conn, tabBrowser, cbObserver); browserWindow = tab.getBrowserWindow(); int index = tabBrowser.addNewTab(tab, ""); tabWindows.put(index, tab); - tabBrowser.setTabsClosable(true); tabBrowser.currentChanged.connect(this, "tabWindowChanged(int)"); tabBrowser.tabCloseRequested.connect(this, "tabWindowClosing(int)"); @@ -626,11 +627,7 @@ public class NeverNote extends QMainWindow{ // ICHANGED // 連想ノートリストをセットアップ - rensoNoteList = new RensoNoteList(conn, this, syncRunner); - rensoNoteList.itemPressed.connect(this, - "rensoNoteItemPressed(QListWidgetItem)"); - rensoNoteListDock = new QDockWidget(tr("Renso Note List"), this); - rensoNoteListDock.setWidget(rensoNoteList); + rensoNoteListDock = new RensoNoteListDock(conn, this, syncRunner, iconPath, tr("Renso Note List")); addDockWidget(DockWidgetArea.RightDockWidgetArea, rensoNoteListDock); if (Global.getListView() == Global.View_List_Wide) { @@ -1253,7 +1250,7 @@ public class NeverNote extends QMainWindow{ saveWindowState(); // 連想ノートリストのEvernote関連ノート取得スレッドを終了 - rensoNoteList.stopThread(); + rensoNoteListDock.getRensoNoteList().stopThread(); if (tempFiles != null) tempFiles.clear(); @@ -1456,7 +1453,7 @@ public class NeverNote extends QMainWindow{ saveNoteColumnPositions(); saveNoteIndexWidth(); showColumns(); - ConfigDialog settings = new ConfigDialog(this); + ConfigDialog settings = new ConfigDialog(this, conn); String dateFormat = Global.getDateFormat(); String timeFormat = Global.getTimeFormat(); @@ -1465,9 +1462,9 @@ public class NeverNote extends QMainWindow{ settings.exec(); indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally(); - indexRunner.indexNoteBody = Global.indexNoteBody(); - indexRunner.indexNoteTitle = Global.indexNoteTitle(); - indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters(); +// indexRunner.indexNoteBody = Global.indexNoteBody(); +// indexRunner.indexNoteTitle = Global.indexNoteTitle(); +// indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters(); indexRunner.indexImageRecognition = Global.indexImageRecognition(); if (Global.showTrayIcon() || Global.minimizeOnClose()) trayIcon.show(); @@ -2968,6 +2965,7 @@ public class NeverNote extends QMainWindow{ status.setResourceCount(conn.getNoteTable().noteResourceTable.getResourceCount()); status.setWordCount(conn.getWordsTable().getWordCount()); status.setHistoryCount(conn.getHistoryTable().getHistoryCount()); + status.setRensoClickCount(conn.getHistoryTable().getRensoClickCount()); waitCursor(false); status.exec(); } @@ -3750,6 +3748,7 @@ public class NeverNote extends QMainWindow{ Global.isConnected = syncRunner.isConnected; + boolean autoLoginMessageFlag = false; if (!Global.isConnected) { OAuthWindow window = new OAuthWindow(logger); if (window.error) { @@ -3776,6 +3775,7 @@ public class NeverNote extends QMainWindow{ syncRunner.authToken = tokenizer.oauth_token; syncRunner.enConnect(); Global.isConnected = syncRunner.isConnected; + autoLoginMessageFlag = true; } // Global.username = syncRunner.username; @@ -3783,9 +3783,16 @@ public class NeverNote extends QMainWindow{ return; setupOnlineMenu(); setupConnectMenuOptions(); + + // 初回ログイン時に自動ログインが無効だったら、有効化するか確認する + if (autoLoginMessageFlag && !Global.automaticLogin()) { + if (QMessageBox.question(this, tr("Confirmation"), tr("Are you sure you want to enable the auto-login feature?"), + QMessageBox.StandardButton.Yes, QMessageBox.StandardButton.No) == StandardButton.Yes.value()) { + Global.setAutomaticLogin(true); + } + } + logger.log(logger.HIGH, "Leaving NeverNote.remoteConnect"); - - } private void setupConnectMenuOptions() { logger.log(logger.HIGH, "entering NeverNote.setupConnectMenuOptions"); @@ -4060,7 +4067,7 @@ public class NeverNote extends QMainWindow{ // ICHANGED // 連想ノートリストを更新 - rensoNoteList.refreshRensoNoteList(currentNoteGuid); + rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid); waitCursor(false); logger.log(logger.HIGH, "Leaving NeverNote.noteTableSelection"); @@ -4909,6 +4916,11 @@ public class NeverNote extends QMainWindow{ fromHistory.remove(i + 1); } + // タブが残り1つになったら、閉じるボタンを消す + if (tabBrowser.count() == 1) { + tabBrowser.hideTabCloseButton(0); + } + // タブの閉じるボタンを押すと、tabWindowClosingより先にtabWindowChangedが呼ばれてしまうので、手動で呼びなおす tabWindowChanged(tabBrowser.currentIndex()); } @@ -6746,7 +6758,15 @@ public class NeverNote extends QMainWindow{ } else indexThreadDeadCount=0; - + if (!rensoNoteListDock.getRensoNoteList().getEnRelatedNotesThread().isAlive()) { + enRelatedNotesThreadDeadCount++; + if (enRelatedNotesThreadDeadCount > MAX && !disableENRelatedNotesThreadCheck) { + QMessageBox.information(this, tr("A thread has died."), tr("It appears as the Evernote Related Notes thread has died. I recommend "+ + "checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry.")); + disableENRelatedNotesThreadCheck = true; + } + } else + enRelatedNotesThreadDeadCount=0; } private void thumbnailTimer() { @@ -7554,7 +7574,7 @@ public class NeverNote extends QMainWindow{ refreshEvernoteNote(true); // 連想ノートリストを更新 - rensoNoteList.refreshRensoNoteList(currentNoteGuid); + rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid); } // ICHANGD @@ -7614,7 +7634,7 @@ public class NeverNote extends QMainWindow{ private void rensoNoteItemPressed(QListWidgetItem current) { logger.log(logger.HIGH, "Nevernote.rensoNoteSelectionChangeに入った"); - rensoNotePressedItemGuid = rensoNoteList.getNoteGuid(current); + rensoNotePressedItemGuid = rensoNoteListDock.getRensoNoteList().getNoteGuid(current); // 右クリックだったら終了 if (QApplication.mouseButtons().isSet(MouseButton.RightButton)) { @@ -7681,7 +7701,7 @@ public class NeverNote extends QMainWindow{ // 除外ノートテーブルに追加 conn.getExcludedTable().addExclusion(guid, currentNoteGuid); - rensoNoteList.refreshRensoNoteList(currentNoteGuid); + rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid); } // ICHANGED @@ -7700,7 +7720,7 @@ public class NeverNote extends QMainWindow{ // スター付きノートテーブルに追加 conn.getStaredTable().addStaredItem(currentNoteGuid, guid); - rensoNoteList.refreshRensoNoteList(currentNoteGuid); + rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid); } // ICHANGED @@ -7719,7 +7739,7 @@ public class NeverNote extends QMainWindow{ // スター付きノートテーブルから削除 conn.getStaredTable().removeStaredItem(currentNoteGuid, guid); - rensoNoteList.refreshRensoNoteList(currentNoteGuid); + rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid); } // ICHANGED @@ -7763,6 +7783,6 @@ public class NeverNote extends QMainWindow{ // 連想ノートリストのgetter public RensoNoteList getRensoNoteList() { - return rensoNoteList; + return rensoNoteListDock.getRensoNoteList(); } } diff --git a/src/cx/fbn/nevernote/dialog/ConfigDialog.java b/src/cx/fbn/nevernote/dialog/ConfigDialog.java index d313565..2e601aa 100644 --- a/src/cx/fbn/nevernote/dialog/ConfigDialog.java +++ b/src/cx/fbn/nevernote/dialog/ConfigDialog.java @@ -44,6 +44,8 @@ import com.trolltech.qt.gui.QVBoxLayout; import cx.fbn.nevernote.Global; import cx.fbn.nevernote.NeverNote; +import cx.fbn.nevernote.sql.DatabaseConnection; +import cx.fbn.nevernote.sql.driver.NSqlQuery; public class ConfigDialog extends QDialog { private final QListWidget contentsWidget; private final ConfigFontPage fontPage; @@ -55,11 +57,13 @@ public class ConfigDialog extends QDialog { private final ConfigIndexPage indexPage; private final ConfigRensoNoteListPage rensoNoteListPage; private final NeverNote parent; + private final DatabaseConnection conn; - private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/"); - - public ConfigDialog(NeverNote parent) { + private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/"); + + public ConfigDialog(NeverNote parent, DatabaseConnection conn) { this.parent = parent; + this.conn = conn; contentsWidget = new QListWidget(this); setWindowIcon(new QIcon(iconPath+"config.png")); @@ -176,13 +180,13 @@ public class ConfigDialog extends QDialog { Global.setIndexNoteBody(indexPage.getIndexNoteBody()); Global.setIndexNoteTitle(indexPage.getIndexNoteTitle()); Global.setIndexImageRecognition(indexPage.getIndexImageRecognition()); - Global.setAutomaticWildcardSearches(indexPage.getAutomaticWildcardSearches()); - Global.setSpecialIndexCharacters(indexPage.getSpecialCharacters()); +// Global.setAutomaticWildcardSearches(indexPage.getAutomaticWildcardSearches()); +// Global.setSpecialIndexCharacters(indexPage.getSpecialCharacters()); Global.setIncludeTagChildren(appearancePage.getIncludeTagChildren()); Global.setDisplayRightToLeft(appearancePage.getDisplayRightToLeft()); Global.userStoreUrl = "https://"+debugPage.getServer()+"/edam/user"; - Global.setWordRegex(indexPage.getRegex()); +// Global.setWordRegex(indexPage.getRegex()); Global.setRecognitionWeight(indexPage.getRecognitionWeight()); Global.setIndexThreadSleepInterval(indexPage.getSleepInterval()); Global.setMessageLevel( debugPage.getDebugLevel()); @@ -225,16 +229,26 @@ public class ConfigDialog extends QDialog { Global.setDefaultFontSize(fontPage.getFontSize()); Global.setDatabaseCache(debugPage.getDatabaseCacheSize()); - // ICHANGED Global.setBrowseWeight(rensoNoteListPage.getBrowseWeight()); Global.setCopyPasteWeight(rensoNoteListPage.getCopyPasteWeight()); Global.setAddNewNoteWeight(rensoNoteListPage.getAddNewNoteWeight()); - Global.setRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight()); - Global.setSameTagWeight(rensoNoteListPage.getSameTagWeight()); + Global.setRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight()); + Global.setSameTagWeight(rensoNoteListPage.getSameTagWeight()); Global.setSameNotebookWeight(rensoNoteListPage.getSameNotebookWeight()); Global.setENRelatedNotesWeight(rensoNoteListPage.getENRelatedNotesWeight()); - // ICHANGED + // 現在カスタムモードなら、カスタムモードの設定値として保存 + String mode = new String(Global.rensoWeightingSelect()); + if (mode.equals("Custom")) { + Global.saveCustomBrowseWeight(rensoNoteListPage.getBrowseWeight()); + Global.saveCustomCopyPasteWeight(rensoNoteListPage.getCopyPasteWeight()); + Global.saveCustomAddNewNoteWeight(rensoNoteListPage.getAddNewNoteWeight()); + Global.saveCustomRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight()); + Global.saveCustomSameTagWeight(rensoNoteListPage.getSameTagWeight()); + Global.saveCustomSameNotebookWeight(rensoNoteListPage.getSameNotebookWeight()); + Global.saveCustomENRelatedNotesWeight(rensoNoteListPage.getENRelatedNotesWeight()); + } + Global.setMergeRensoNote(rensoNoteListPage.getMergeChecked()); Global.setDuplicateRensoNote(rensoNoteListPage.getDuplicateChecked()); Global.setVerifyExclude(rensoNoteListPage.getVerifyExcludeChecked()); @@ -243,6 +257,16 @@ public class ConfigDialog extends QDialog { // 連想ノートリストをリフレッシュ parent.getRensoNoteList().refreshRensoNoteList(parent.getCurrentNoteGuid()); + // 全文検索の対象項目を再設定 + NSqlQuery nQuery = new NSqlQuery(conn.getConnection()); + NSqlQuery rQuery = new NSqlQuery(conn.getResourceConnection()); + // カラム単位で削除できないので一度全部消す + nQuery.exec("CALL FTL_DROP_ALL();"); + rQuery.exec("CALL FTL_DROP_ALL();"); + // 再構築 + Global.rebuildFullTextNoteTarget(conn); + Global.rebuildFullTextResourceTarget(conn); + close(); } @@ -351,7 +375,7 @@ public class ConfigDialog extends QDialog { appearancePage.setDisplayRightToLeft(Global.displayRightToLeft()); appearancePage.setStartupNotebook(Global.getStartupNotebook()); - indexPage.setRegex(Global.getWordRegex()); +// indexPage.setRegex(Global.getWordRegex()); indexPage.setSleepInterval(Global.getIndexThreadSleepInterval()); connectionPage.setSyncInterval(Global.getSyncInterval()); diff --git a/src/cx/fbn/nevernote/dialog/ConfigIndexPage.java b/src/cx/fbn/nevernote/dialog/ConfigIndexPage.java index cad505a..2420a9f 100644 --- a/src/cx/fbn/nevernote/dialog/ConfigIndexPage.java +++ b/src/cx/fbn/nevernote/dialog/ConfigIndexPage.java @@ -44,10 +44,10 @@ public class ConfigIndexPage extends QWidget { private final QCheckBox indexAttachmentsLocally; private final QCheckBox indexImageRecognition; private final QCheckBox indexTitle; - private final QCheckBox automaticWildcard; - private final QLineEdit specialStrip; +// private final QCheckBox automaticWildcard; +// private final QLineEdit specialStrip; private final QCheckBox indexBody; - private final QLineEdit regexEdit; +// private final QLineEdit regexEdit; public ConfigIndexPage(QWidget parent) { // super(parent); @@ -76,23 +76,23 @@ public class ConfigIndexPage extends QWidget { indexImageRecognition = new QCheckBox(tr("Index Image Recognition")); indexImageRecognition.setChecked(Global.indexImageRecognition()); - automaticWildcard = new QCheckBox(tr("Automatically Wildcard All Searches")); - automaticWildcard.setChecked(Global.automaticWildcardSearches()); +// automaticWildcard = new QCheckBox(tr("Automatically Wildcard All Searches")); +// automaticWildcard.setChecked(Global.automaticWildcardSearches()); - specialStrip = new QLineEdit(); - specialStrip.setText(Global.getSpecialIndexCharacters()); +// specialStrip = new QLineEdit(); +// specialStrip.setText(Global.getSpecialIndexCharacters()); QVBoxLayout attachmentLayout = new QVBoxLayout(); attachmentLayout.addWidget(indexBody); attachmentLayout.addWidget(indexTitle); attachmentLayout.addWidget(indexAttachmentsLocally); attachmentLayout.addWidget(indexImageRecognition); - attachmentLayout.addWidget(automaticWildcard); +// attachmentLayout.addWidget(automaticWildcard); - QHBoxLayout specialCharLayout = new QHBoxLayout(); - specialCharLayout.addWidget(new QLabel(tr("Special Word Characters"))); - specialCharLayout.addWidget(specialStrip); - attachmentLayout.addLayout(specialCharLayout); +// QHBoxLayout specialCharLayout = new QHBoxLayout(); +// specialCharLayout.addWidget(new QLabel(tr("Special Word Characters"))); +// specialCharLayout.addWidget(specialStrip); +// attachmentLayout.addLayout(specialCharLayout); attachmentGroup.setLayout(attachmentLayout); // Index sleep interval @@ -109,22 +109,22 @@ public class ConfigIndexPage extends QWidget { sleepGroup.setLayout(sleepLayout); // Regular Expressions for word parsing - QGroupBox regexGroup = new QGroupBox(tr("Word Parse")); - QLabel regexLabel = new QLabel(tr("Regular Expression")); - regexEdit = new QLineEdit(); - regexEdit.setText(Global.getWordRegex()); - - QHBoxLayout regexLayout = new QHBoxLayout(); - regexLayout.addWidget(regexLabel); - regexLayout.addWidget(regexEdit); - regexGroup.setLayout(regexLayout); +// QGroupBox regexGroup = new QGroupBox(tr("Word Parse")); +// QLabel regexLabel = new QLabel(tr("Regular Expression")); +// regexEdit = new QLineEdit(); +// regexEdit.setText(Global.getWordRegex()); +// +// QHBoxLayout regexLayout = new QHBoxLayout(); +// regexLayout.addWidget(regexLabel); +// regexLayout.addWidget(regexEdit); +// regexGroup.setLayout(regexLayout); QVBoxLayout mainLayout = new QVBoxLayout(); mainLayout.addWidget(sleepGroup); mainLayout.addWidget(weightGroup); mainLayout.addWidget(attachmentGroup); - mainLayout.addWidget(regexGroup); +// mainLayout.addWidget(regexGroup); mainLayout.addStretch(1); setLayout(mainLayout); @@ -144,15 +144,15 @@ public class ConfigIndexPage extends QWidget { public boolean getIndexNoteTitle() { return indexTitle.isChecked(); } - public String getSpecialCharacters() { - return specialStrip.text(); - } +// public String getSpecialCharacters() { +// return specialStrip.text(); +// } public boolean getIndexImageRecognition() { return indexImageRecognition.isChecked(); } - public boolean getAutomaticWildcardSearches() { - return automaticWildcard.isChecked(); - } +// public boolean getAutomaticWildcardSearches() { +// return automaticWildcard.isChecked(); +// } //***************************************** //* Word length get/set methods @@ -181,11 +181,11 @@ public class ConfigIndexPage extends QWidget { //***************************************** //* Regex get/set methods //***************************************** - public void setRegex(String s) { - regexEdit.setText(s); - } - public String getRegex() { - return regexEdit.text(); - } +// public void setRegex(String s) { +// regexEdit.setText(s); +// } +// public String getRegex() { +// return regexEdit.text(); +// } } diff --git a/src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java b/src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java index 646b571..1b888bf 100644 --- a/src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java +++ b/src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java @@ -25,6 +25,7 @@ import com.trolltech.qt.gui.QCheckBox; import com.trolltech.qt.gui.QFormLayout; import com.trolltech.qt.gui.QGroupBox; import com.trolltech.qt.gui.QHBoxLayout; +import com.trolltech.qt.gui.QLabel; import com.trolltech.qt.gui.QSlider; import com.trolltech.qt.gui.QSpinBox; import com.trolltech.qt.gui.QVBoxLayout; @@ -208,19 +209,45 @@ public class ConfigRensoNoteListPage extends QWidget { enRelatedNotesLayout.addWidget(enRelatedNotesSpinner); // 重み付け設定部分のレイアウト + QVBoxLayout vLayout = new QVBoxLayout(); QFormLayout styleLayout = new QFormLayout(); styleLayout.setHorizontalSpacing(10); styleLayout.setVerticalSpacing(30); - styleLayout.addRow(tr("Browse Weight"), browseLayout); + styleLayout.addRow(tr("Concurrent Browse Weight"), browseLayout); styleLayout.addRow(tr("Copy&Paste Weight"), copyPasteLayout); styleLayout.addRow(tr("Add New Note Weight"), addNewNoteLayout); styleLayout.addRow(tr("Renso Item Click Weight"), rensoItemClickLayout); styleLayout.addRow(tr("Same Tag Weight"), sameTagLayout); styleLayout.addRow(tr("Same Notebook Weight"), sameNotebookLayout); - styleLayout.addRow(tr("Evernote Related Notes Integration"), enRelatedNotesLayout); + styleLayout.addRow(tr("Evernote Related Notes Weight"), enRelatedNotesLayout); + vLayout.addLayout(styleLayout); QGroupBox weightingGroup = new QGroupBox(tr("Weighting")); - weightingGroup.setLayout(styleLayout); + weightingGroup.setLayout(vLayout); + + // プリセットモードがカスタム以外ならば設定不可能にする + String mode = new String(Global.rensoWeightingSelect()); + if (!mode.equals("Custom")) { + QLabel attention = new QLabel(tr("You can change these settings if you select \"Custom\" Mode.")); + attention.setStyleSheet("color : red"); + vLayout.insertWidget(0, attention); + vLayout.insertSpacing(1, 20); + + browseSlider.setEnabled(false); + browseSpinner.setEnabled(false); + copyPasteSlider.setEnabled(false); + copyPasteSpinner.setEnabled(false); + addNewNoteSlider.setEnabled(false); + addNewNoteSpinner.setEnabled(false); + rensoItemClickSlider.setEnabled(false); + rensoItemClickSpinner.setEnabled(false); + sameTagSlider.setEnabled(false); + sameTagSpinner.setEnabled(false); + sameNotebookSlider.setEnabled(false); + sameNotebookSpinner.setEnabled(false); + enRelatedNotesSlider.setEnabled(false); + enRelatedNotesSpinner.setEnabled(false); + } // ノートのマージ・複製の関連ノートリストへの適用 mergeCheck = new QCheckBox(tr("When you merge the notes, also merge RensoNoteList")); diff --git a/src/cx/fbn/nevernote/dialog/DatabaseStatus.java b/src/cx/fbn/nevernote/dialog/DatabaseStatus.java index c13b54e..6d3f189 100644 --- a/src/cx/fbn/nevernote/dialog/DatabaseStatus.java +++ b/src/cx/fbn/nevernote/dialog/DatabaseStatus.java @@ -44,6 +44,7 @@ public class DatabaseStatus extends QDialog { QLabel indexCount; QLabel resourceIndexNeeded; QLabel historyCount; + QLabel rensoClickCount; private final QPushButton ok; private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/"); @@ -63,6 +64,7 @@ public class DatabaseStatus extends QDialog { resourceIndexNeeded = new QLabel(); indexCount = new QLabel(); historyCount = new QLabel(); + rensoClickCount = new QLabel(); grid.addWidget(new QLabel(tr("Notebooks:")), 0,0); grid.addWidget(notebookCount, 0,1); @@ -94,11 +96,14 @@ public class DatabaseStatus extends QDialog { grid.addWidget(new QLabel(tr("Tobal Behavior History:")), 9, 0); grid.addWidget(historyCount, 9,1); + grid.addWidget(new QLabel(tr("Renso Note Click:")), 10, 0); + grid.addWidget(rensoClickCount, 10, 1); + QGridLayout buttonLayout = new QGridLayout(); ok = new QPushButton(tr("OK")); ok.clicked.connect(this, "okPushed()"); buttonLayout.addWidget(ok, 1, 1); - grid.addLayout(buttonLayout,10,1); + grid.addLayout(buttonLayout,11,1); } @SuppressWarnings("unused") @@ -135,6 +140,9 @@ public class DatabaseStatus extends QDialog { public void setHistoryCount(int d) { historyCount.setText(NumberFormat.getInstance().format(d)); } + public void setRensoClickCount(int d) { + rensoClickCount.setText(NumberFormat.getInstance().format(d)); + } public QPushButton getOkButton() { return ok; } diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java index 7a5e5f5..cf0bf91 100644 --- a/src/cx/fbn/nevernote/gui/BrowserWindow.java +++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java @@ -548,6 +548,8 @@ public class BrowserWindow extends QWidget { buttonLayout.addWidget(newSeparator()); fontList = new QComboBox(); fontSize = new QComboBox(); + fontList.setMaximumWidth(130); + fontSize.setMaximumWidth(45); fontList.setToolTip("Font"); fontSize.setToolTip("Font Size"); fontList.activated.connect(this, "fontChanged(String)"); diff --git a/src/cx/fbn/nevernote/gui/MainMenuBar.java b/src/cx/fbn/nevernote/gui/MainMenuBar.java index 44fc5f8..3fdc158 100644 --- a/src/cx/fbn/nevernote/gui/MainMenuBar.java +++ b/src/cx/fbn/nevernote/gui/MainMenuBar.java @@ -225,7 +225,8 @@ public class MainMenuBar extends QMenuBar { noteDuplicateAction = new QAction(tr("Duplicate"), this); noteDuplicateAction.setToolTip(tr("Duplicate this note")); noteDuplicateAction.triggered.connect(parent, "duplicateNote()"); - setupShortcut(noteReindex, "File_Note_Duplicate"); + // IFIXED + setupShortcut(noteDuplicateAction, "File_Note_Duplicate"); noteMergeAction = new QAction(tr("Merge Notes"), this); noteMergeAction.setToolTip(tr("Merge Multiple notes")); diff --git a/src/cx/fbn/nevernote/gui/RensoNoteList.java b/src/cx/fbn/nevernote/gui/RensoNoteList.java index 9355541..ba8ed62 100644 --- a/src/cx/fbn/nevernote/gui/RensoNoteList.java +++ b/src/cx/fbn/nevernote/gui/RensoNoteList.java @@ -65,9 +65,9 @@ public class RensoNoteList extends QListWidget { private String guid; private int allPointSum; - public RensoNoteList(DatabaseConnection c, NeverNote p, SyncRunner syncRunner) { - logger = new ApplicationLogger("rensoNoteList.log"); - logger.log(logger.HIGH, "Setting up rensoNoteList"); + public RensoNoteList(DatabaseConnection c, NeverNote p, SyncRunner syncRunner, ApplicationLogger logger) { + this.logger = logger; + this.logger.log(this.logger.HIGH, "Setting up rensoNoteList"); allPointSum = 0; this.conn = c; @@ -77,10 +77,10 @@ public class RensoNoteList extends QListWidget { this.guid = new String(); mergedHistory = new HashMap(); enRelatedNotesCache = new HashMap>(); - this.enRelatedNotesRunner = new ENRelatedNotesRunner(this.syncRunner, logger); + this.enRelatedNotesRunner = new ENRelatedNotesRunner(this.syncRunner, this.logger); this.enRelatedNotesRunner.enRelatedNotesSignal.getENRelatedNotesFinished.connect(this, "enRelatedNotesComplete()"); this.enRelatedNotesThread = new QThread(enRelatedNotesRunner, "ENRelatedNotes Thread"); - this.enRelatedNotesThread.start(); + this.getEnRelatedNotesThread().start(); rensoNoteListItems = new HashMap(); rensoNoteListTrueItems = new ArrayList(); @@ -110,12 +110,18 @@ public class RensoNoteList extends QListWidget { menu.addAction(excludeNoteAction); menu.aboutToHide.connect(this, "contextMenuHidden()"); - logger.log(logger.HIGH, "rensoNoteList setup complete"); + this.logger.log(this.logger.HIGH, "rensoNoteList setup complete"); + } + + // オーバーロード + // 現在開いているノートの連想ノートリストをリフレッシュ + public void refreshRensoNoteList() { + refreshRensoNoteList(guid); } // 連想ノートリストをリフレッシュ public void refreshRensoNoteList(String guid) { - logger.log(logger.HIGH, "Entering RensoNoteList.refreshRensoNoteList"); + logger.log(logger.HIGH, "Entering RensoNoteList.refreshRensoNoteList guid = " + guid); this.clear(); rensoNoteListItems.clear(); @@ -149,6 +155,8 @@ public class RensoNoteList extends QListWidget { // 操作履歴をデータベースから取得してノートごとの関連度を算出、その後mergedHistoryに追加 private void calculateHistory(String guid) { + logger.log(logger.EXTREME, "Entering RensoNoteList.calculateHistory guid = " + guid); + // browseHistory HashMap browseHistory = conn.getHistoryTable().getBehaviorHistory("browse", guid); addWeight(browseHistory, Global.getBrowseWeight()); @@ -178,20 +186,27 @@ public class RensoNoteList extends QListWidget { HashMap sameNotebookHistory = conn.getHistoryTable().getBehaviorHistory("sameNotebook", guid); addWeight(sameNotebookHistory, Global.getSameNotebookWeight()); mergedHistory = mergeHistory(sameNotebookHistory, mergedHistory); + logger.log(logger.EXTREME, "Leaving RensoNoteList.calculateHistory"); } // 操作回数に重み付けする private void addWeight(HashMap history, int weight){ + logger.log(logger.EXTREME, "Entering RensoNoteList.addWeight"); + Set keySet = history.keySet(); Iterator hist_iterator = keySet.iterator(); while(hist_iterator.hasNext()){ String key = hist_iterator.next(); history.put(key, history.get(key) * weight); } + + logger.log(logger.EXTREME, "Leaving RensoNoteList.addWeight"); } // 連想ノートリストを再描画 private void repaintRensoNoteList(boolean needClear) { + logger.log(logger.EXTREME, "Entering RensoNoteList.repaintRensoNoteList"); + if (needClear) { this.clear(); rensoNoteListItems.clear(); @@ -209,10 +224,14 @@ public class RensoNoteList extends QListWidget { } addRensoNoteList(mergedHistory); + + logger.log(logger.EXTREME, "Leaving RensoNoteList.repaintRensoNoteList"); } // 引数1と引数2をマージしたハッシュマップを返す private HashMap mergeHistory(HashMap History1, HashMap History2){ + logger.log(logger.EXTREME, "Entering RensoNoteList.mergeHistory"); + HashMap mergedHistory = new HashMap(); mergedHistory.putAll(History1); @@ -227,12 +246,15 @@ public class RensoNoteList extends QListWidget { mergedHistory.put(key, History2.get(key)); } } - + + logger.log(logger.EXTREME, "Leaving RensoNoteList.mergeHistory"); return mergedHistory; } // 連想ノートリストにハッシュマップのデータを追加 private void addRensoNoteList(HashMap History){ + logger.log(logger.EXTREME, "Entering RensoNoteList.addRensoNoteList"); + String currentNoteGuid = new String(parent.getCurrentNoteGuid()); // スター付きノートとスター無しノートを分ける @@ -301,6 +323,7 @@ public class RensoNoteList extends QListWidget { } } } + logger.log(logger.EXTREME, "Leaving RensoNoteList.addRensoNoteList"); } // リストのアイテムから対象ノートのguidを取得 @@ -311,6 +334,8 @@ public class RensoNoteList extends QListWidget { // 関連ノートリストの右クリックメニュー @Override public void contextMenuEvent(QContextMenuEvent event){ + logger.log(logger.EXTREME, "Entering RensoNoteList.contextMenuEvent"); + if (rensoNotePressedItemGuid == null || rensoNotePressedItemGuid.equals("")) { return; } @@ -337,6 +362,8 @@ public class RensoNoteList extends QListWidget { menu.exec(event.globalPos()); rensoNotePressedItemGuid = null; + + logger.log(logger.EXTREME, "Leaving RensoNoteList.contextMenuEvent"); } // コンテキストメニューが表示されているかどうか @@ -356,16 +383,22 @@ public class RensoNoteList extends QListWidget { // ユーザが連想ノートリストのアイテムを選択した時の処理 @SuppressWarnings("unused") private void rensoNoteItemPressed(QListWidgetItem current) { + logger.log(logger.HIGH, "Entering RensoNoteList.rensoNoteItemPressed"); + rensoNotePressedItemGuid = null; // 右クリックだったときの処理 if (QApplication.mouseButtons().isSet(MouseButton.RightButton)) { rensoNotePressedItemGuid = getNoteGuid(current); } + + logger.log(logger.HIGH, "Leaving RensoNoteList.rensoNoteItemPressed"); } // Evernoteの関連ノートの取得が完了 @SuppressWarnings("unused") private void enRelatedNotesComplete() { + logger.log(logger.HIGH, "Entering RensoNoteList.enRelatedNotesComplete"); + Pair> enRelatedNoteGuidPair = enRelatedNotesRunner.getENRelatedNoteGuids(); // <元ノートguid, 関連ノートguidリスト> if (enRelatedNoteGuidPair == null) { @@ -388,10 +421,14 @@ public class RensoNoteList extends QListWidget { } } } + + logger.log(logger.HIGH, "Leaving RensoNoteList.enRelatedNotesComplete"); } // Evernote関連ノートの関連度情報をmergedHistoryに追加 private void addENRelatedNotes(List relatedNoteGuids) { + logger.log(logger.EXTREME, "Entering RensoNoteList.addENRelatedNotes"); + // Evernote関連ノート HashMap enRelatedNotes = new HashMap(); @@ -400,13 +437,27 @@ public class RensoNoteList extends QListWidget { } mergedHistory = mergeHistory(enRelatedNotes, mergedHistory); + + logger.log(logger.EXTREME, "Leaving RensoNoteList.addENRelatedNotes"); } // Evernoteの関連ノート取得スレッドを終了させる public boolean stopThread() { + logger.log(logger.HIGH, "Entering RensoNoteList.stopThread"); + if (enRelatedNotesRunner.addStop()) { + logger.log(logger.HIGH, "RensoNoteList.stopThread succeeded"); return true; } + logger.log(logger.HIGH, "RensoNoteList.stopThread failed"); return false; } + + public QThread getEnRelatedNotesThread() { + return enRelatedNotesThread; + } + + public String getGuid() { + return guid; + } } diff --git a/src/cx/fbn/nevernote/gui/RensoNoteListDock.java b/src/cx/fbn/nevernote/gui/RensoNoteListDock.java new file mode 100644 index 0000000..69d11c3 --- /dev/null +++ b/src/cx/fbn/nevernote/gui/RensoNoteListDock.java @@ -0,0 +1,177 @@ +/* + * This file is part of NeighborNote + * Copyright 2013 Yuki Takahashi + * + * This file may be licensed under the terms of of the + * GNU General Public License Version 2 (the ``GPL''). + * + * Software distributed under the License is distributed + * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either + * express or implied. See the GPL for the specific language + * governing rights and limitations. + * + * You should have received a copy of the GPL along with this + * program. If not, go to http://www.gnu.org/licenses/gpl.html + * or write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * +*/ + +package cx.fbn.nevernote.gui; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import com.trolltech.qt.core.QSize; +import com.trolltech.qt.gui.QComboBox; +import com.trolltech.qt.gui.QDockWidget; +import com.trolltech.qt.gui.QIcon; +import com.trolltech.qt.gui.QLabel; +import com.trolltech.qt.gui.QMessageBox; +import com.trolltech.qt.gui.QPushButton; +import com.trolltech.qt.gui.QSizePolicy; +import com.trolltech.qt.gui.QToolBar; +import com.trolltech.qt.gui.QVBoxLayout; +import com.trolltech.qt.gui.QWidget; + +import cx.fbn.nevernote.Global; +import cx.fbn.nevernote.NeverNote; +import cx.fbn.nevernote.sql.DatabaseConnection; +import cx.fbn.nevernote.threads.SyncRunner; +import cx.fbn.nevernote.utilities.ApplicationLogger; + +public class RensoNoteListDock extends QDockWidget { + private final DatabaseConnection conn; + private final NeverNote parent; + private final SyncRunner syncRunner; + private final ApplicationLogger logger; + private final QPushButton haltLogButton; // 操作ログの取得を停止ボタン + private final QComboBox weightingModeSelect; // 連想ノートリストの重み付けプリセットモード + private final RensoNoteList rensoNoteList; // 連想ノートリスト + private final QToolBar rensoToolBar; // 連想ノートリストドックのツールバー + private enum PresetMode {Standard, ConcurrentBrowse, OperationToOrganize, ContentSimilarity, Custom}; // プリセットモード一覧 + + private final String iconPath; + + public RensoNoteListDock(DatabaseConnection conn, NeverNote parent, SyncRunner syncRunner, String iconPath, String title) { + super(title); + + this.logger = new ApplicationLogger("rensoNoteList.log"); + this.logger.log(this.logger.HIGH, "Setting up rensoNoteListDock"); + + this.conn = conn; + this.parent = parent; + this.iconPath = iconPath; + this.syncRunner = syncRunner; + + QVBoxLayout vLayout = new QVBoxLayout(); + rensoToolBar = new QToolBar(); + vLayout.addWidget(rensoToolBar); + + QLabel modeLabel = new QLabel(tr("Mode: ")); + modeLabel.setToolTip(tr("Preset Weighting Mode")); + rensoToolBar.addWidget(modeLabel); + + weightingModeSelect = new QComboBox(); + weightingModeSelect.setMaximumWidth(150); + weightingModeSelect.setToolTip(tr("Preset Weighting Mode")); + weightingModeSelect.insertItem(PresetMode.Standard.ordinal(), tr("Standard")); + weightingModeSelect.insertItem(PresetMode.ConcurrentBrowse.ordinal(), tr("Concurrent Browse")); + weightingModeSelect.insertItem(PresetMode.OperationToOrganize.ordinal(), ("Operation to Organize")); + weightingModeSelect.insertItem(PresetMode.ContentSimilarity.ordinal(), tr("Content Similarity")); + weightingModeSelect.insertItem(PresetMode.Custom.ordinal(), tr("Custom")); + int savedModeIndex = 0; + try { + savedModeIndex = PresetMode.valueOf(Global.rensoWeightingSelect()).ordinal(); + } catch (Exception e) { + this.logger.log(this.logger.EXTREME, "Exception in weightingModeSelect = " + e); + } + if (savedModeIndex >= 0) { + weightingModeSelect.setCurrentIndex(savedModeIndex); + } else { + weightingModeSelect.setCurrentIndex(0); + } + weightingModeSelect.currentIndexChanged.connect(this, "weightingModeChanged(int)"); + rensoToolBar.addWidget(weightingModeSelect); + + haltLogButton = new QPushButton(); + QIcon haltLogIcon = new QIcon(this.iconPath + "haltLog.png"); + haltLogButton.setIcon(haltLogIcon); + haltLogButton.setIconSize(new QSize(24, 24)); + haltLogButton.setToolTip(tr("Halt Collectiong Operation Log")); + haltLogButton.setCheckable(true); + haltLogButton.setChecked(Global.isHaltLogButton()); + haltLogButton.toggled.connect(this, "haltLogToggled(boolean)"); + + // ログ取得停止ボタンを右寄せするためのスペーサ + QWidget spacer = new QWidget(); + spacer.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding); + rensoToolBar.addWidget(spacer); + rensoToolBar.addWidget(haltLogButton); + + rensoNoteList = new RensoNoteList(this.conn, this.parent, this.syncRunner, this.logger); + getRensoNoteList().itemPressed.connect(this.parent, "rensoNoteItemPressed(QListWidgetItem)"); + vLayout.addWidget(getRensoNoteList()); + + QWidget w = new QWidget(); + w.setLayout(vLayout); + this.setWidget(w); + } + + @SuppressWarnings("unused") + private void weightingModeChanged(int modeIndex) { + logger.log(logger.EXTREME, "RensoNoteListDock.weightingModeChanged modeIndex = " + modeIndex); + + PresetMode mode = Global.fromOrdinal(PresetMode.class, modeIndex); + + // プリセットの重み付けマップを用意 + // 値は同時閲覧、コピペ、新規ノート追加、連想ノートクリック、同じタグ、同じノートブック、Evernote関連ノートの順 + Map> presetMap = new EnumMap>(PresetMode.class); + presetMap.put(PresetMode.Standard, Arrays.asList(1, 3, 3, 10, 2, 2, 5)); + presetMap.put(PresetMode.ConcurrentBrowse, Arrays.asList(5, 2, 3, 10, 1, 1, 2)); + presetMap.put(PresetMode.OperationToOrganize, Arrays.asList(1, 2, 3, 10, 5, 5, 2)); + presetMap.put(PresetMode.ContentSimilarity, Arrays.asList(1, 2, 2, 10, 1, 1, 10)); + presetMap.put(PresetMode.Custom, Arrays.asList(Global.customBrowseWeight(), Global.customCopyPasteWeight(), + Global.customAddNewNoteWeight(), Global.customRensoItemClickWeight(), Global.customSameTagWeight(), + Global.customSameNotebookWeight(), Global.customENRelatedNotesWeight())); + + List weightList = new ArrayList(presetMap.get(mode)); + Global.setBrowseWeight(weightList.get(0)); + Global.setCopyPasteWeight(weightList.get(1)); + Global.setAddNewNoteWeight(weightList.get(2)); + Global.setRensoItemClickWeight(weightList.get(3)); + Global.setSameTagWeight(weightList.get(4)); + Global.setSameNotebookWeight(weightList.get(5)); + Global.setENRelatedNotesWeight(weightList.get(6)); + + Global.saveRensoWeightingSelect(mode.name()); + + // 連想ノートリストをリフレッシュ + if (rensoNoteList != null && rensoNoteList.getGuid() != null ) { + rensoNoteList.refreshRensoNoteList(); + + // カスタムモードかつアプリ起動時以外なら、メッセージ表示 + if (mode == PresetMode.Custom) { + QMessageBox.information(this, tr("Information"), tr("Custom mode was selected.\nYou can customize weighting manually in the Edit/Preferences/Renso Note List.")); + } + } + } + + @SuppressWarnings("unused") + private void haltLogToggled(boolean checked) { + logger.log(logger.EXTREME, "RensoNoteListDock.haltLogToggled"); + + if (checked) { + QMessageBox.information(this, tr("Information"), tr("Collecting operation log halted.\nYou can resume, if you press this button again.")); + } + Global.saveHaltLogButton(checked); + } + + public RensoNoteList getRensoNoteList() { + return rensoNoteList; + } + +} diff --git a/src/cx/fbn/nevernote/gui/RensoNoteListItem.java b/src/cx/fbn/nevernote/gui/RensoNoteListItem.java index 294495b..732a0ef 100644 --- a/src/cx/fbn/nevernote/gui/RensoNoteListItem.java +++ b/src/cx/fbn/nevernote/gui/RensoNoteListItem.java @@ -48,7 +48,7 @@ public class RensoNoteListItem extends QWidget{ private final int relationPoints; private final String noteCreated; private final String tagNames; - private String noteContent; + private final String noteContent; private final RensoNoteList parent; private final boolean isStared; private final int allPointSum; @@ -81,12 +81,8 @@ public class RensoNoteListItem extends QWidget{ this.tagNames = new String(sb); // this.noteContent = new String(note.getContent()); - this.noteContent = conn.getNoteTable().getNoteContentNoUTFConversion(note.getGuid()); - this.noteContent = this.noteContent.replaceAll("<.+?>", ""); - this.noteContent = this.noteContent.replaceAll("\\s{2,}", " "); - String kaigyo = System.getProperty("line.separator"); - this.noteContent = this.noteContent.replaceAll(kaigyo, ""); - +// this.noteContent = Global.extractPlainText(conn.getNoteTable().getNoteContentNoUTFConversion(note.getGuid())); + this.noteContent = conn.getNoteTable().getNoteContentText(note.getGuid()); palette = new QPalette(); palette.setColor(QPalette.ColorRole.Window, new QColor(255, 255, 255)); this.setPalette(palette); diff --git a/src/cx/fbn/nevernote/gui/TabBrowserWidget.java b/src/cx/fbn/nevernote/gui/TabBrowserWidget.java index 83debac..4d4535a 100644 --- a/src/cx/fbn/nevernote/gui/TabBrowserWidget.java +++ b/src/cx/fbn/nevernote/gui/TabBrowserWidget.java @@ -20,6 +20,8 @@ // ICHANGED package cx.fbn.nevernote.gui; +import com.trolltech.qt.core.QSize; +import com.trolltech.qt.gui.QTabBar; import com.trolltech.qt.gui.QTabWidget; import com.trolltech.qt.gui.QWidget; @@ -28,6 +30,7 @@ import cx.fbn.nevernote.NeverNote; public class TabBrowserWidget extends QTabWidget { private final TabBrowserBar bar; private final NeverNote parent; + private QSize closeButtonSize; public TabBrowserWidget(NeverNote parent) { super(parent); @@ -41,6 +44,18 @@ public class TabBrowserWidget extends QTabWidget { int index = this.addTab(widget, new String()); bar.addNewTab(index, title); this.setTabToolTip(index, title); + + // タブが1個（多分これが発生するのはアプリ起動時だけ）なら閉じるボタンを隠す + // タブが2個以上あったら、一番左のタブの閉じるボタンを復元する + int tabCnt = this.count(); + if (tabCnt == 1) { + hideTabCloseButton(0); + } else if (tabCnt >= 2) { + if (closeButtonSize != null && !bar.tabButton(0, QTabBar.ButtonPosition.RightSide).size().equals(closeButtonSize)) { + showTabCloseButton(0); + } + } + return index; } @@ -49,4 +64,20 @@ public class TabBrowserWidget extends QTabWidget { this.setTabToolTip(index, title); } + // タブを閉じるボタンを隠す + public void hideTabCloseButton(int index) { + if (closeButtonSize == null) { + closeButtonSize = bar.tabButton(index, QTabBar.ButtonPosition.RightSide).size(); + } + bar.tabButton(index, QTabBar.ButtonPosition.RightSide).resize(0, 0); + } + + // タブを閉じるボタンを復元する + public void showTabCloseButton(int index) { + if (closeButtonSize != null) { + bar.tabButton(index, QTabBar.ButtonPosition.RightSide).resize(closeButtonSize); + } else { + bar.tabButton(index, QTabBar.ButtonPosition.RightSide).resize(16, 16); + } + } } diff --git a/src/cx/fbn/nevernote/icons/haltLog.png b/src/cx/fbn/nevernote/icons/haltLog.png new file mode 100644 index 0000000..8c0df76 Binary files /dev/null and b/src/cx/fbn/nevernote/icons/haltLog.png differ diff --git a/src/cx/fbn/nevernote/sql/DatabaseConnection.java b/src/cx/fbn/nevernote/sql/DatabaseConnection.java index ef314b5..965896a 100644 --- a/src/cx/fbn/nevernote/sql/DatabaseConnection.java +++ b/src/cx/fbn/nevernote/sql/DatabaseConnection.java @@ -290,6 +290,44 @@ public class DatabaseConnection { executeSql("alter table note add column attributeContentClass VarChar"); executeSql("update note set attributeContentClass = ''"); } + + // Apache Luceneを使った日本語検索のためのプレーンテキストノートコンテンツカラムを準備 + if (!dbTableColumnExists("NOTE", "CONTENTTEXT")) { + executeSql("alter table note add column contentText VarChar"); + executeSql("update note set contentText = ''"); + NSqlQuery query = new NSqlQuery(conn); + query.exec("Select guid, content from Note where contentText = ''"); + while (query.next()) { + String guid = query.valueString(0); + String content = query.valueString(1); + String contentText = Global.extractPlainText(content); + NSqlQuery query2 = new NSqlQuery(conn); + query2.prepare("update note set contentText=:contentText where guid=:guid"); + query2.bindValue(":contentText", contentText); + query2.bindValue(":guid", guid); + query2.exec(); + } + + // Apache Luceneを使った全文検索のための準備 + query.exec("CREATE ALIAS IF NOT EXISTS FTL_INIT FOR \"org.h2.fulltext.FullTextLuceneEx.init\""); + query.exec("CALL FTL_INIT()"); + + Global.rebuildFullTextNoteTarget(this); + } + + // Apache Luceneを使った日本語検索のためのプレーンテキストノートリソースカラムを準備 + NSqlQuery rQuery = new NSqlQuery(resourceConn); + rQuery.exec("select TABLE_NAME from INFORMATION_SCHEMA.COLUMNS where TABLE_NAME='NOTERESOURCES' and COLUMN_NAME='RESOURCETEXT'"); + if (!rQuery.next()) { + rQuery.exec("alter table noteResources add column resourceText VarChar"); + rQuery.exec("update noteResources set resourceText = ''"); + + // Apache Luceneを使った全文検索のための準備 + rQuery.exec("CREATE ALIAS IF NOT EXISTS FTL_INIT FOR \"org.h2.fulltext.FullTextLuceneEx.init\""); + rQuery.exec("CALL FTL_INIT()"); + + Global.rebuildFullTextResourceTarget(this); + } } public void executeSql(String sql) { diff --git a/src/cx/fbn/nevernote/sql/HistoryTable.java b/src/cx/fbn/nevernote/sql/HistoryTable.java index 3ba31bf..0d16a11 100644 --- a/src/cx/fbn/nevernote/sql/HistoryTable.java +++ b/src/cx/fbn/nevernote/sql/HistoryTable.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import cx.fbn.nevernote.Global; import cx.fbn.nevernote.sql.driver.NSqlQuery; import cx.fbn.nevernote.utilities.ApplicationLogger; @@ -58,6 +59,11 @@ public class HistoryTable { NSqlQuery query = new NSqlQuery(db.getBehaviorConnection()); boolean excludedCheck = false; + // 操作ログの取得を停止中 + if (Global.isHaltLogButton()) { + return; + } + if (behaviorType == null) { return; } @@ -309,4 +315,13 @@ public class HistoryTable { int returnValue = new Integer(query.valueString(0)); return returnValue; } + + // 連想ノートクリック回数を取得 + public int getRensoClickCount() { + NSqlQuery query = new NSqlQuery(db.getBehaviorConnection()); + query.exec("Select count(*) from History where behaviorType='rensoItemClick'"); + query.next(); + int returnValue = new Integer(query.valueString(0)); + return returnValue; + } } diff --git a/src/cx/fbn/nevernote/sql/NoteResourceTable.java b/src/cx/fbn/nevernote/sql/NoteResourceTable.java index 99746c6..d5507aa 100644 --- a/src/cx/fbn/nevernote/sql/NoteResourceTable.java +++ b/src/cx/fbn/nevernote/sql/NoteResourceTable.java @@ -675,5 +675,27 @@ public class NoteResourceTable { NSqlQuery query = new NSqlQuery(db.getResourceConnection()); query.exec("update noteresources set isdirty=false"); } + + // リソーステキストを更新 + public void updateResourceText(String guid, String text) { + logger.log(logger.HIGH, "Entering NoteResourceTable.updateResourceText"); + NSqlQuery query = new NSqlQuery(db.getResourceConnection()); + boolean check = query.prepare("Update noteResources set resourceText=:resourceText where guid=:guid"); + if (!check) { + logger.log(logger.EXTREME, "Update resourceText sql prepare has failed."); + logger.log(logger.MEDIUM, query.lastError()); + } + + query.bindValue(":resourceText", text); + query.bindValue(":guid", guid); + + check = query.exec(); + if (!check) { + logger.log(logger.EXTREME, "Update resourceText has failed."); + logger.log(logger.MEDIUM, query.lastError()); + } + logger.log(logger.HIGH, "Leaving NoteResourceTable.updateResourceText"); + query.exec(); + } } diff --git a/src/cx/fbn/nevernote/sql/NoteTable.java b/src/cx/fbn/nevernote/sql/NoteTable.java index 0710817..36c0dca 100644 --- a/src/cx/fbn/nevernote/sql/NoteTable.java +++ b/src/cx/fbn/nevernote/sql/NoteTable.java @@ -111,13 +111,13 @@ public class NoteTable { +"contentHash, contentLength, created, updated, deleted, active, notebookGuid, " +"attributeSubjectDate, attributeLatitude, attributeLongitude, attributeAltitude, " +"attributeAuthor, attributeSource, attributeSourceUrl, attributeSourceApplication, " - +"indexNeeded, isExpunged, isDirty, titlecolor, thumbnailneeded" + +"indexNeeded, isExpunged, isDirty, titlecolor, thumbnailneeded, contentText" +") Values(" +":guid, :updateSequenceNumber, :title, :content, " +":contentHash, :contentLength, :created, :updated, :deleted, :active, :notebookGuid, " +":attributeSubjectDate, :attributeLatitude, :attributeLongitude, :attributeAltitude, " +":attributeAuthor, :attributeSource, :attributeSourceUrl, :attributeSourceApplication, " - +":indexNeeded, :isExpunged, :isDirty, -1, true) "); + +":indexNeeded, :isExpunged, :isDirty, -1, true, :contentText) "); StringBuilder created = new StringBuilder(simple.format(n.getCreated())); StringBuilder updated = new StringBuilder(simple.format(n.getUpdated())); @@ -130,10 +130,18 @@ public class NoteTable { query.bindValue(":title", n.getTitle()); if (isDirty) { EnmlConverter enml = new EnmlConverter(logger); + String contentText = Global.extractPlainText(enml.fixEnXMLCrap(enml.fixEnMediaCrap(n.getContent()))); + query.bindValue(":content", enml.fixEnXMLCrap(enml.fixEnMediaCrap(n.getContent()))); + query.bindValue(":contentText", contentText); } - else + else { + String contentText = Global.extractPlainText(n.getContent()); + query.bindValue(":content", n.getContent()); + query.bindValue(":contentText", contentText); + + } query.bindValue(":contentHash", n.getContentHash()); query.bindValue(":contentLength", n.getContentLength()); query.bindValue(":created", created.toString()); @@ -567,7 +575,7 @@ public class NoteTable { public void updateNoteContent(String guid, String content) { logger.log(logger.HIGH, "Entering NoteTable.updateNoteContent"); NSqlQuery query = new NSqlQuery(db.getConnection()); - boolean check = query.prepare("Update Note set content=:content, updated=CURRENT_TIMESTAMP(), isDirty=true, indexNeeded=true, " + + boolean check = query.prepare("Update Note set content=:content, contentText=:contentText, updated=CURRENT_TIMESTAMP(), isDirty=true, indexNeeded=true, " + " thumbnailneeded=true where guid=:guid"); if (!check) { logger.log(logger.EXTREME, "Update note content sql prepare has failed."); @@ -578,6 +586,7 @@ public class NoteTable { // codec = QTextCodec.codecForName("UTF-8"); // query.bindValue(":content", codec.fromUnicode(content).toString()); query.bindValue(":content", content); + query.bindValue(":contentText", Global.extractPlainText(content)); query.bindValue(":guid", guid); check = query.exec(); @@ -1594,8 +1603,9 @@ public class NoteTable { newSegment + n.getContent().substring(endPos); NSqlQuery query = new NSqlQuery(db.getConnection()); - query.prepare("update note set isdirty=true, thumbnailneeded=true, content=:content where guid=:guid"); + query.prepare("update note set isdirty=true, thumbnailneeded=true, content=:content, contentText=:contentText where guid=:guid"); query.bindValue(":content", content); + query.bindValue(":contentText", Global.extractPlainText(content)); query.bindValue(":guid", n.getGuid()); query.exec(); } @@ -1760,7 +1770,35 @@ public class NoteTable { * * boolean retVal = query.valueBoolean(0, false); return retVal; } */ + + // ノートコンテンツのプレーンテキストを取得 + public String getNoteContentText(String noteGuid) { + + if (noteGuid == null) + return null; + if (noteGuid.trim().equals("")) + return null; + + NSqlQuery query = new NSqlQuery(db.getConnection()); + query.prepare("Select contentText from Note where guid=:guid"); + query.bindValue(":guid", noteGuid); + if (!query.exec()) { + logger.log(logger.MEDIUM, "Noteテーブルからプレーンコンテンツの取得失敗"); + logger.log(logger.MEDIUM, query.lastError()); + return null; + } + if (!query.next()) { + logger.log(logger.EXTREME, "SQL Retrieve failed for note guid " + + noteGuid + " in getNotePlainContent()"); + logger.log(logger.EXTREME, " -> " + query.lastError().toString()); + logger.log(logger.EXTREME, " -> " + query.lastError()); + return null; + } + + String noteContentText = query.valueString(0); + return noteContentText; + } } diff --git a/src/cx/fbn/nevernote/sql/REnSearch.java b/src/cx/fbn/nevernote/sql/REnSearch.java index 1a0ec5b..46f2edf 100644 --- a/src/cx/fbn/nevernote/sql/REnSearch.java +++ b/src/cx/fbn/nevernote/sql/REnSearch.java @@ -33,7 +33,6 @@ import com.evernote.edam.type.Note; import com.evernote.edam.type.Notebook; import com.evernote.edam.type.Tag; -import cx.fbn.nevernote.Global; import cx.fbn.nevernote.sql.driver.NSqlQuery; import cx.fbn.nevernote.utilities.ApplicationLogger; @@ -392,16 +391,16 @@ public class REnSearch { searchPhrases.add(word.toLowerCase()); } if (!searchPhrase && pos < 0) { - if (word != null && word.length() > 0 && !Global.automaticWildcardSearches()) + if (word != null && word.length() > 0/* && !Global.automaticWildcardSearches()*/) getWords().add(word); - if (word != null && word.length() > 0 && Global.automaticWildcardSearches()) { - String wildcardWord = word; - if (!wildcardWord.startsWith("*")) - wildcardWord = "*"+wildcardWord; - if (!wildcardWord.endsWith("*")) - wildcardWord = wildcardWord+"*"; - getWords().add(wildcardWord); - } +// if (word != null && word.length() > 0 && Global.automaticWildcardSearches()) { +// String wildcardWord = word; +// if (!wildcardWord.startsWith("*")) +// wildcardWord = "*"+wildcardWord; +// if (!wildcardWord.endsWith("*")) +// wildcardWord = wildcardWord+"*"; +// getWords().add(wildcardWord); +// } // getWords().add("*"+word+"*"); //// WILDCARD } if (word.startsWith("intitle:")) @@ -705,12 +704,17 @@ public class REnSearch { NSqlQuery indexQuery = new NSqlQuery(conn.getIndexConnection()); NSqlQuery mergeQuery = new NSqlQuery(conn.getConnection()); NSqlQuery deleteQuery = new NSqlQuery(conn.getConnection()); + NSqlQuery ftlNoteQuery = new NSqlQuery(conn.getConnection()); + NSqlQuery ftlResourceQuery = new NSqlQuery(conn.getResourceConnection()); + ftlNoteQuery.prepare("SELECT N.GUID AS GUID FROM FTL_SEARCH_DATA(:text, 0, 0) FT, NOTE N WHERE FT.TABLE='NOTE' AND N.GUID=FT.KEYS[0]"); + ftlResourceQuery.prepare("SELECT R.GUID AS GUID FROM FTL_SEARCH_DATA(:text, 0, 0) FT, NOTERESOURCES R WHERE FT.TABLE='NOTERESOURCES' AND R.GUID=FT.KEYS[0]"); insertQuery.prepare("Insert into SEARCH_RESULTS (guid) values (:guid)"); mergeQuery.prepare("Insert into SEARCH_RESULTS_MERGE (guid) values (:guid)"); if (subSelect) { for (int i=0; i= " +minimumRecognitionWeight + " and word=:word"); @@ -732,6 +736,43 @@ public class REnSearch { mergeQuery.exec(); } } + + // luceneによる全文検索　ノートテーブル + ftlNoteQuery.bindValue(":text", getWords().get(i)); + ftlNoteQuery.exec(); + while(ftlNoteQuery.next()) { + guid = ftlNoteQuery.valueString(0); + if (i==0 || any) { + insertQuery.bindValue(":guid", guid); + insertQuery.exec(); + } else { + mergeQuery.bindValue(":guid", guid); + mergeQuery.exec(); + } + } + // luceneによる全文検索　リソーステーブル + NSqlQuery rQuery = new NSqlQuery(conn.getResourceConnection()); + ftlResourceQuery.bindValue(":text", getWords().get(i)); + ftlResourceQuery.exec(); + while(ftlResourceQuery.next()) { + guid = ftlResourceQuery.valueString(0); + + // リソースguidからノートguidを算出 + rQuery.prepare("Select noteGuid from noteResources where guid=:guid"); + rQuery.bindValue(":guid", guid); + rQuery.exec(); + while(rQuery.next()) { + guid = rQuery.valueString(0); + if (i==0 || any) { + insertQuery.bindValue(":guid", guid); + insertQuery.exec(); + } else { + mergeQuery.bindValue(":guid", guid); + mergeQuery.exec(); + } + } + } + if (i>0 && !any) { deleteQuery.exec("Delete from SEARCH_RESULTS where guid not in (select guid from SEARCH_RESULTS_MERGE)"); deleteQuery.exec("Delete from SEARCH_RESULTS_MERGE"); diff --git a/src/cx/fbn/nevernote/threads/IndexRunner.java b/src/cx/fbn/nevernote/threads/IndexRunner.java index c6a8dc3..ad26cd6 100644 --- a/src/cx/fbn/nevernote/threads/IndexRunner.java +++ b/src/cx/fbn/nevernote/threads/IndexRunner.java @@ -30,7 +30,6 @@ import java.util.TreeSet; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.locks.LockSupport; -import org.apache.commons.lang3.StringEscapeUtils; import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.ParseContext; @@ -44,7 +43,6 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import com.evernote.edam.type.Data; -import com.evernote.edam.type.Note; import com.evernote.edam.type.Resource; import com.trolltech.qt.core.QByteArray; import com.trolltech.qt.core.QIODevice.OpenModeFlag; @@ -74,10 +72,10 @@ public class IndexRunner extends QObject implements Runnable { public final int REINDEXNOTE=3; public boolean keepRunning; private final QDomDocument doc; - private static String regex = Global.getWordRegex(); - public String specialIndexCharacters = ""; - public boolean indexNoteBody = true; - public boolean indexNoteTitle = true; +// private static String regex = Global.getWordRegex(); +// public String specialIndexCharacters = ""; +// public boolean indexNoteBody = true; +// public boolean indexNoteTitle = true; public boolean indexImageRecognition = true; private final DatabaseConnection conn; private volatile LinkedBlockingQueue workQueue; @@ -163,62 +161,62 @@ public class IndexRunner extends QObject implements Runnable { } // Reindex a note - public void indexNoteContent() { - foundWords.clear(); - - logger.log(logger.EXTREME, "Entering indexRunner.indexNoteContent()"); - - logger.log(logger.EXTREME, "Getting note content"); - Note n = conn.getNoteTable().getNote(guid,true,false,true,true, true); - String data; - if (indexNoteBody) { - data = n.getContent(); - data = conn.getNoteTable().getNoteContentNoUTFConversion(n.getGuid()); - - logger.log(logger.EXTREME, "Removing any encrypted data"); - data = removeEnCrypt(data.toString()); - logger.log(logger.EXTREME, "Removing xml markups"); - } else - data = ""; - String text; - if (indexNoteTitle) - text = removeTags(StringEscapeUtils.unescapeHtml4(data) +" "+ n.getTitle()); - else - text = removeTags(StringEscapeUtils.unescapeHtml4(data)); - - logger.log(logger.EXTREME, "Splitting words"); - String[] result = text.toString().split(regex); - conn.commitTransaction(); - conn.beginTransaction(); - logger.log(logger.EXTREME, "Deleting existing words for note from index"); - conn.getWordsTable().expungeFromWordIndex(guid, "CONTENT"); - - logger.log(logger.EXTREME, "Number of words found: " +result.length); - for (int j=0; j=0; i--) { - if (!Character.isLetterOrDigit(buffer.charAt(i)) && specialIndexCharacters.indexOf(buffer.charAt(i)) == -1) - buffer.deleteCharAt(i); - else - break; - } - buffer = buffer.reverse(); - for (int i=buffer.length()-1; i>=0; i--) { - if (!Character.isLetterOrDigit(buffer.charAt(i))) - buffer.deleteCharAt(i); - else - break; - } - buffer = buffer.reverse(); - if (buffer.length() > 0) { - // We have a good word, now let's trim off junk at the beginning or end - if (!foundWords.contains(buffer.toString())) { - foundWords.add(buffer.toString()); - foundWords.add(word); - conn.getWordsTable().addWordToNoteIndex(guid, buffer.toString(), type, 100); - uncommittedCount++; - if (uncommittedCount > 100) { - conn.commitTransaction(); - uncommittedCount=0; - } - } - } - return; +// private void addToIndex(String guid, String word, String type) { +// if (foundWords.contains(word)) +// return; +// StringBuffer buffer = new StringBuffer(word.toLowerCase()); +// for (int i=buffer.length()-1; i>=0; i--) { +// if (!Character.isLetterOrDigit(buffer.charAt(i)) && specialIndexCharacters.indexOf(buffer.charAt(i)) == -1) +// buffer.deleteCharAt(i); +// else +// break; +// } +// buffer = buffer.reverse(); +// for (int i=buffer.length()-1; i>=0; i--) { +// if (!Character.isLetterOrDigit(buffer.charAt(i))) +// buffer.deleteCharAt(i); +// else +// break; +// } +// buffer = buffer.reverse(); +// if (buffer.length() > 0) { +// // We have a good word, now let's trim off junk at the beginning or end +// if (!foundWords.contains(buffer.toString())) { +// foundWords.add(buffer.toString()); +// foundWords.add(word); +// conn.getWordsTable().addWordToNoteIndex(guid, buffer.toString(), type, 100); +// uncommittedCount++; +// if (uncommittedCount > 100) { +// conn.commitTransaction(); +// uncommittedCount=0; +// } +// } +// } +// return; +// } + + // ノートリソーステーブルのリソーステキストに追加 + private void updateResourceText(String guid, String text) { + conn.getNoteTable().noteResourceTable.updateResourceText(guid, text); } private void scanUnindexed() { - List notes = conn.getNoteTable().getUnindexed(); +// List notes = conn.getNoteTable().getUnindexed(); guid = null; boolean started = false; - if (notes.size() > 0) { - signal.indexStarted.emit(); - started = true; - } - for (int i=0; i 0) { +// signal.indexStarted.emit(); +// started = true; +// } +// for (int i=0; i unindexedResources = conn.getNoteTable().noteResourceTable.getUnindexed(); if (unindexedResources.size() > 0 && !started) { diff --git a/src/cx/fbn/nevernote/xml/NoteFormatter.java b/src/cx/fbn/nevernote/xml/NoteFormatter.java index 17674e1..9a62abd 100644 --- a/src/cx/fbn/nevernote/xml/NoteFormatter.java +++ b/src/cx/fbn/nevernote/xml/NoteFormatter.java @@ -123,8 +123,9 @@ public class NoteFormatter { logger.log(logger.EXTREME, "Note guid: " +currentNoteGuid); logger.log(logger.EXTREME, "Note Text:" +currentNote); QDomDocument doc = new QDomDocument(); - QDomDocument.Result result = doc.setContent(currentNote.getContent()); - +// QDomDocument.Result result = doc.setContent(currentNote.getContent()); + QDomDocument.Result result = doc.setContent(conn.getNoteTable().getNoteContentNoUTFConversion(currentNote.getGuid())); + // Handle any errors if (!result.success) { logger.log(logger.LOW, "Error parsing document. Attempting to restructure"); @@ -197,8 +198,13 @@ public class NoteFormatter { for (int j=z-1; j>i+1; j--) html.deleteCharAt(j); } + + QTextCodec codec; + codec = QTextCodec.codecForName("UTF-8"); + String value = codec.fromUnicode(html.toString()).toString(); + return value; - return html.toString(); //.replace(" -1) { term = term.replace("*", ""); - } else { + }/* else { term = "\\b"+term+"\\b"; - } + }*/ regex.append(term); if (i cx.fbn.nevernote.NeverNote - + Beginning shutdown. - + Performing synchronization before closing. @@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not - - + + - - - - - + + + + + + Confirmation - + Are you sure Are you sure you wish to decrypt the database? - + Decryption Complete - + Decryption is complete - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -78,7 +79,7 @@ Do you wish to proceed? - + Incorrect Password @@ -93,71 +94,71 @@ Do you wish to proceed? - + Release Notes - + Tool Bar - - + + Connect - - + + Connect to Evernote - + Disconnect - + Disconnect from Evernote - + Database will be reindexed. - + Notes will be reindexed. - + Note will be reindexed. - + Error Saving Note - + Note has never been synchronized. - - - + + + Error - + Unable to connect to the database. The most probable reason is that some other process @@ -169,58 +170,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit - + Add Note - + Are you sure - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -276,183 +277,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print - - + + Tag - + Attributes - - + + Email - - + + Delete - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -462,57 +468,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. - + Getting Note History - + Note not found on server. - + This note could not be found on Evernote's servers. - + History retrieved - + Restoring as new note. - + Note has been restored as a new note. - + Restoring note. - + Note has been restored. - + DOUGH!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -531,135 +537,141 @@ Who knows, you might get lucky. - + Finalizing Synchronization - + Synchronization Complete - + Synchronization completed with errors. Please check the log for details. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? - + Indexing is now enabled. - + Indexing is now disabled. - - + + Backup Database - + Backing up database - + Database backup completed. - + 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 @@ -669,52 +681,52 @@ Are you sure you want to continue? - + Restore Database - + Restoring database - + Database has been restored. - + Exporting Notes - + Export completed. - + Import Notes - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. @@ -1039,52 +1051,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel - + OK - + Settings - + Appearance - + Fonts - + Indexing - + Spell Check - + Connection - + Debugging - + Renso Note List @@ -1150,16 +1162,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval @@ -1169,76 +1171,76 @@ Are you sure you want to continue? Seconds between looking for unindexed notes - - - Word Parse - - - - - Regular Expression - - cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1565,57 +1567,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status - + Notebooks: - + Tags: - + Total Notes: - + Unsynchronized Notes: - + Unindexed Notes: - + Attachments/Images: - + Unindexed Attachments/Images: - + Saved Searches: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK @@ -2616,15 +2628,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -2984,43 +3011,43 @@ If you don't wish to use Evernote's then please check the option at th - + Font Color - + Font Hilight Color - + Source URL: - + Source URL: - - + + http:// - + Author: - + Unable Open - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3028,97 +3055,97 @@ and I'm too lazy to figure them out by myself. - + Error - + Error Encrypting String - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found - + A file attachment may not exceed 25MB. - + Attachment Size - - + + Save File - + Insert Hyperlink - + Edit Hyperlink - - + + Spell Check Error - + Spell Check Complete @@ -3689,506 +3716,506 @@ and I'm too lazy to figure them out by myself. - + Merge Notes - + Merge Multiple notes - + Export Selected Notes - + Export selected notes - + Copy as URL - + Import Notes - + Import notes - - - - + + + + Add - + Add a new note - + Modify Tags - + Change the tags assigned to this note - - - - + + + + Delete - + Delete this note - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note - + Find a string in the current note - + Undo - + Redo - + Cut - + Copy - + Paste - + Paste Without Formatting - + Show Note List - + Show/Hide Note List - + Show Tags - + Show/Hide Tags - + Show Notebooks - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview - + Preview Notes - + Show Saved Searches - + Show/Hide Saved Searches - + Show Attribute Searches - + Show/Hide Attribute Searches - + Show Trash - + Show/Hide Trash Tree - + Show Editor Button Bar - + Show/Hide Editor Button Bar - + Hide Left Side Panels - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left - + Left Align - + Right - + Right Align - + Center - + Center Align - + Bold - + Italic - + Underline - + Superscript - + Subscript - + Strikethrough - + Horizontal Line - + Bulleted List - + Numbered List - + Numbered list - + >> Increase - + << Decrease - - - + + + Edit - + Share With The World - + Share With Individuals - + Open/Close Notebooks - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect - + Synchronize with Evernote - + Note History - + Selective Synchronize - + Account Information - + Database Status - + Show current database information - + Disable Note Indexing - + Manually Stop Note Indexing - + Automatic Folder Importing - + Import Files Automatically - + Spell Check - + Check for spelling errors - + Encrypt Database - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4208,22 +4235,22 @@ and I'm too lazy to figure them out by myself. - + Release Notes - + Release notes - + Check For Updates - + Check for newer versions @@ -4334,47 +4361,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4613,224 +4697,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! - + Cleaning up - + Synchronizing complete - + Download syncronization complete. Uploads have been disabled. - + Synchronizing deleted notes. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. - + Downloading - + % complete. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_da.ts b/translations/neighbornote_da.ts index 48ef5c0..8b01d20 100644 --- a/translations/neighbornote_da.ts +++ b/translations/neighbornote_da.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. - + Performing synchronization before closing. @@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not - - + + - - - - - + + + + + + Confirmation - + Are you sure Are you sure you wish to decrypt the database? - + Decryption Complete - + Decryption is complete - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -78,7 +79,7 @@ Do you wish to proceed? - + Incorrect Password @@ -93,71 +94,71 @@ Do you wish to proceed? - + Release Notes - + Tool Bar - - + + Connect - - + + Connect to Evernote - + Disconnect - + Disconnect from Evernote - + Database will be reindexed. - + Notes will be reindexed. - + Note will be reindexed. - + Error Saving Note - + Note has never been synchronized. - - - + + + Error - + Unable to connect to the database. The most probable reason is that some other process @@ -169,58 +170,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit - + Add Note - + Are you sure - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -276,183 +277,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print - - + + Tag - + Attributes - - + + Email - - + + Delete - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -462,57 +468,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. - + Getting Note History - + Note not found on server. - + This note could not be found on Evernote's servers. - + History retrieved - + Restoring as new note. - + Note has been restored as a new note. - + Restoring note. - + Note has been restored. - + DOUGH!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -531,135 +537,141 @@ Who knows, you might get lucky. - + Finalizing Synchronization - + Synchronization Complete - + Synchronization completed with errors. Please check the log for details. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? - + Indexing is now enabled. - + Indexing is now disabled. - - + + Backup Database - + Backing up database - + Database backup completed. - + 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 @@ -669,52 +681,52 @@ Are you sure you want to continue? - + Restore Database - + Restoring database - + Database has been restored. - + Exporting Notes - + Export completed. - + Import Notes - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. @@ -1039,52 +1051,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel - + OK - + Settings - + Appearance - + Fonts - + Indexing - + Spell Check - + Connection - + Debugging - + Renso Note List @@ -1150,16 +1162,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval @@ -1169,76 +1171,76 @@ Are you sure you want to continue? Seconds between looking for unindexed notes - - - Word Parse - - - - - Regular Expression - - cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1565,57 +1567,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status - + Notebooks: - + Tags: - + Total Notes: - + Unsynchronized Notes: - + Unindexed Notes: - + Attachments/Images: - + Unindexed Attachments/Images: - + Saved Searches: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK @@ -2616,15 +2628,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -2984,43 +3011,43 @@ If you don't wish to use Evernote's then please check the option at th - + Font Color - + Font Hilight Color - + Source URL: - + Source URL: - - + + http:// - + Author: - + Unable Open - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3028,97 +3055,97 @@ and I'm too lazy to figure them out by myself. - + Error - + Error Encrypting String - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found - + A file attachment may not exceed 25MB. - + Attachment Size - - + + Save File - + Insert Hyperlink - + Edit Hyperlink - - + + Spell Check Error - + Spell Check Complete @@ -3689,506 +3716,506 @@ and I'm too lazy to figure them out by myself. - + Merge Notes - + Merge Multiple notes - + Export Selected Notes - + Export selected notes - + Copy as URL - + Import Notes - + Import notes - - - - + + + + Add - + Add a new note - + Modify Tags - + Change the tags assigned to this note - - - - + + + + Delete - + Delete this note - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note - + Find a string in the current note - + Undo - + Redo - + Cut - + Copy - + Paste - + Paste Without Formatting - + Show Note List - + Show/Hide Note List - + Show Tags - + Show/Hide Tags - + Show Notebooks - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview - + Preview Notes - + Show Saved Searches - + Show/Hide Saved Searches - + Show Attribute Searches - + Show/Hide Attribute Searches - + Show Trash - + Show/Hide Trash Tree - + Show Editor Button Bar - + Show/Hide Editor Button Bar - + Hide Left Side Panels - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left - + Left Align - + Right - + Right Align - + Center - + Center Align - + Bold - + Italic - + Underline - + Superscript - + Subscript - + Strikethrough - + Horizontal Line - + Bulleted List - + Numbered List - + Numbered list - + >> Increase - + << Decrease - - - + + + Edit - + Share With The World - + Share With Individuals - + Open/Close Notebooks - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect - + Synchronize with Evernote - + Note History - + Selective Synchronize - + Account Information - + Database Status - + Show current database information - + Disable Note Indexing - + Manually Stop Note Indexing - + Automatic Folder Importing - + Import Files Automatically - + Spell Check - + Check for spelling errors - + Encrypt Database - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4208,22 +4235,22 @@ and I'm too lazy to figure them out by myself. - + Release Notes - + Release notes - + Check For Updates - + Check for newer versions @@ -4334,47 +4361,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4613,224 +4697,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! - + Cleaning up - + Synchronizing complete - + Download syncronization complete. Uploads have been disabled. - + Synchronizing deleted notes. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. - + Downloading - + % complete. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_de.ts b/translations/neighbornote_de.ts index 143ecc2..3fe8d2d 100644 --- a/translations/neighbornote_de.ts +++ b/translations/neighbornote_de.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. - + Performing synchronization before closing. @@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not - - + + - - - - - + + + + + + Confirmation - + Are you sure Are you sure you wish to decrypt the database? - + Decryption Complete - + Decryption is complete - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -78,7 +79,7 @@ Do you wish to proceed? - + Incorrect Password @@ -93,71 +94,71 @@ Do you wish to proceed? - + Release Notes - + Tool Bar - - + + Connect - - + + Connect to Evernote - + Disconnect - + Disconnect from Evernote - + Database will be reindexed. - + Notes will be reindexed. - + Note will be reindexed. - + Error Saving Note - + Note has never been synchronized. - - - + + + Error - + Unable to connect to the database. The most probable reason is that some other process @@ -169,58 +170,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit - + Add Note - + Are you sure - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -276,183 +277,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print - - + + Tag - + Attributes - - + + Email - - + + Delete - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -462,57 +468,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. - + Getting Note History - + Note not found on server. - + This note could not be found on Evernote's servers. - + History retrieved - + Restoring as new note. - + Note has been restored as a new note. - + Restoring note. - + Note has been restored. - + DOUGH!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -531,135 +537,141 @@ Who knows, you might get lucky. - + Finalizing Synchronization - + Synchronization Complete - + Synchronization completed with errors. Please check the log for details. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? - + Indexing is now enabled. - + Indexing is now disabled. - - + + Backup Database - + Backing up database - + Database backup completed. - + 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 @@ -669,52 +681,52 @@ Are you sure you want to continue? - + Restore Database - + Restoring database - + Database has been restored. - + Exporting Notes - + Export completed. - + Import Notes - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. @@ -1039,52 +1051,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel - + OK - + Settings - + Appearance - + Fonts - + Indexing - + Spell Check - + Connection - + Debugging - + Renso Note List @@ -1150,16 +1162,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval @@ -1169,76 +1171,76 @@ Are you sure you want to continue? Seconds between looking for unindexed notes - - - Word Parse - - - - - Regular Expression - - cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1565,57 +1567,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status - + Notebooks: - + Tags: - + Total Notes: - + Unsynchronized Notes: - + Unindexed Notes: - + Attachments/Images: - + Unindexed Attachments/Images: - + Saved Searches: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK @@ -2616,15 +2628,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -2984,43 +3011,43 @@ If you don't wish to use Evernote's then please check the option at th - + Font Color - + Font Hilight Color - + Source URL: - + Source URL: - - + + http:// - + Author: - + Unable Open - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3028,97 +3055,97 @@ and I'm too lazy to figure them out by myself. - + Error - + Error Encrypting String - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found - + A file attachment may not exceed 25MB. - + Attachment Size - - + + Save File - + Insert Hyperlink - + Edit Hyperlink - - + + Spell Check Error - + Spell Check Complete @@ -3689,506 +3716,506 @@ and I'm too lazy to figure them out by myself. - + Merge Notes - + Merge Multiple notes - + Export Selected Notes - + Export selected notes - + Copy as URL - + Import Notes - + Import notes - - - - + + + + Add - + Add a new note - + Modify Tags - + Change the tags assigned to this note - - - - + + + + Delete - + Delete this note - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note - + Find a string in the current note - + Undo - + Redo - + Cut - + Copy - + Paste - + Paste Without Formatting - + Show Note List - + Show/Hide Note List - + Show Tags - + Show/Hide Tags - + Show Notebooks - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview - + Preview Notes - + Show Saved Searches - + Show/Hide Saved Searches - + Show Attribute Searches - + Show/Hide Attribute Searches - + Show Trash - + Show/Hide Trash Tree - + Show Editor Button Bar - + Show/Hide Editor Button Bar - + Hide Left Side Panels - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left - + Left Align - + Right - + Right Align - + Center - + Center Align - + Bold - + Italic - + Underline - + Superscript - + Subscript - + Strikethrough - + Horizontal Line - + Bulleted List - + Numbered List - + Numbered list - + >> Increase - + << Decrease - - - + + + Edit - + Share With The World - + Share With Individuals - + Open/Close Notebooks - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect - + Synchronize with Evernote - + Note History - + Selective Synchronize - + Account Information - + Database Status - + Show current database information - + Disable Note Indexing - + Manually Stop Note Indexing - + Automatic Folder Importing - + Import Files Automatically - + Spell Check - + Check for spelling errors - + Encrypt Database - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4208,22 +4235,22 @@ and I'm too lazy to figure them out by myself. - + Release Notes - + Release notes - + Check For Updates - + Check for newer versions @@ -4334,47 +4361,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4613,224 +4697,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! - + Cleaning up - + Synchronizing complete - + Download syncronization complete. Uploads have been disabled. - + Synchronizing deleted notes. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. - + Downloading - + % complete. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_es.ts b/translations/neighbornote_es.ts index be7eac6..768625f 100644 --- a/translations/neighbornote_es.ts +++ b/translations/neighbornote_es.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. - + Performing synchronization before closing. @@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not - - + + - - - - - + + + + + + Confirmation - + Are you sure Are you sure you wish to decrypt the database? - + Decryption Complete - + Decryption is complete - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -78,7 +79,7 @@ Do you wish to proceed? - + Incorrect Password @@ -93,71 +94,71 @@ Do you wish to proceed? - + Release Notes - + Tool Bar - - + + Connect - - + + Connect to Evernote - + Disconnect - + Disconnect from Evernote - + Database will be reindexed. - + Notes will be reindexed. - + Note will be reindexed. - + Error Saving Note - + Note has never been synchronized. - - - + + + Error - + Unable to connect to the database. The most probable reason is that some other process @@ -169,58 +170,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit - + Add Note - + Are you sure - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -276,183 +277,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print - - + + Tag - + Attributes - - + + Email - - + + Delete - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -462,57 +468,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. - + Getting Note History - + Note not found on server. - + This note could not be found on Evernote's servers. - + History retrieved - + Restoring as new note. - + Note has been restored as a new note. - + Restoring note. - + Note has been restored. - + DOUGH!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -531,135 +537,141 @@ Who knows, you might get lucky. - + Finalizing Synchronization - + Synchronization Complete - + Synchronization completed with errors. Please check the log for details. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? - + Indexing is now enabled. - + Indexing is now disabled. - - + + Backup Database - + Backing up database - + Database backup completed. - + 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 @@ -669,52 +681,52 @@ Are you sure you want to continue? - + Restore Database - + Restoring database - + Database has been restored. - + Exporting Notes - + Export completed. - + Import Notes - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. @@ -1039,52 +1051,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel - + OK - + Settings - + Appearance - + Fonts - + Indexing - + Spell Check - + Connection - + Debugging - + Renso Note List @@ -1150,16 +1162,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval @@ -1169,76 +1171,76 @@ Are you sure you want to continue? Seconds between looking for unindexed notes - - - Word Parse - - - - - Regular Expression - - cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1565,57 +1567,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status - + Notebooks: - + Tags: - + Total Notes: - + Unsynchronized Notes: - + Unindexed Notes: - + Attachments/Images: - + Unindexed Attachments/Images: - + Saved Searches: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK @@ -2616,15 +2628,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -2984,43 +3011,43 @@ If you don't wish to use Evernote's then please check the option at th - + Font Color - + Font Hilight Color - + Source URL: - + Source URL: - - + + http:// - + Author: - + Unable Open - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3028,97 +3055,97 @@ and I'm too lazy to figure them out by myself. - + Error - + Error Encrypting String - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found - + A file attachment may not exceed 25MB. - + Attachment Size - - + + Save File - + Insert Hyperlink - + Edit Hyperlink - - + + Spell Check Error - + Spell Check Complete @@ -3689,506 +3716,506 @@ and I'm too lazy to figure them out by myself. - + Merge Notes - + Merge Multiple notes - + Export Selected Notes - + Export selected notes - + Copy as URL - + Import Notes - + Import notes - - - - + + + + Add - + Add a new note - + Modify Tags - + Change the tags assigned to this note - - - - + + + + Delete - + Delete this note - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note - + Find a string in the current note - + Undo - + Redo - + Cut - + Copy - + Paste - + Paste Without Formatting - + Show Note List - + Show/Hide Note List - + Show Tags - + Show/Hide Tags - + Show Notebooks - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview - + Preview Notes - + Show Saved Searches - + Show/Hide Saved Searches - + Show Attribute Searches - + Show/Hide Attribute Searches - + Show Trash - + Show/Hide Trash Tree - + Show Editor Button Bar - + Show/Hide Editor Button Bar - + Hide Left Side Panels - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left - + Left Align - + Right - + Right Align - + Center - + Center Align - + Bold - + Italic - + Underline - + Superscript - + Subscript - + Strikethrough - + Horizontal Line - + Bulleted List - + Numbered List - + Numbered list - + >> Increase - + << Decrease - - - + + + Edit - + Share With The World - + Share With Individuals - + Open/Close Notebooks - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect - + Synchronize with Evernote - + Note History - + Selective Synchronize - + Account Information - + Database Status - + Show current database information - + Disable Note Indexing - + Manually Stop Note Indexing - + Automatic Folder Importing - + Import Files Automatically - + Spell Check - + Check for spelling errors - + Encrypt Database - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4208,22 +4235,22 @@ and I'm too lazy to figure them out by myself. - + Release Notes - + Release notes - + Check For Updates - + Check for newer versions @@ -4334,47 +4361,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4613,224 +4697,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! - + Cleaning up - + Synchronizing complete - + Download syncronization complete. Uploads have been disabled. - + Synchronizing deleted notes. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. - + Downloading - + % complete. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_fr.ts b/translations/neighbornote_fr.ts index 265d413..3b3eef2 100644 --- a/translations/neighbornote_fr.ts +++ b/translations/neighbornote_fr.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. - + Performing synchronization before closing. @@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not - - + + - - - - - + + + + + + Confirmation - + Are you sure Are you sure you wish to decrypt the database? - + Decryption Complete - + Decryption is complete - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -78,7 +79,7 @@ Do you wish to proceed? - + Incorrect Password @@ -93,71 +94,71 @@ Do you wish to proceed? - + Release Notes - + Tool Bar - - + + Connect - - + + Connect to Evernote - + Disconnect - + Disconnect from Evernote - + Database will be reindexed. - + Notes will be reindexed. - + Note will be reindexed. - + Error Saving Note - + Note has never been synchronized. - - - + + + Error - + Unable to connect to the database. The most probable reason is that some other process @@ -169,58 +170,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit - + Add Note - + Are you sure - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -276,183 +277,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print - - + + Tag - + Attributes - - + + Email - - + + Delete - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -462,57 +468,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. - + Getting Note History - + Note not found on server. - + This note could not be found on Evernote's servers. - + History retrieved - + Restoring as new note. - + Note has been restored as a new note. - + Restoring note. - + Note has been restored. - + DOUGH!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -531,135 +537,141 @@ Who knows, you might get lucky. - + Finalizing Synchronization - + Synchronization Complete - + Synchronization completed with errors. Please check the log for details. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? - + Indexing is now enabled. - + Indexing is now disabled. - - + + Backup Database - + Backing up database - + Database backup completed. - + 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 @@ -669,52 +681,52 @@ Are you sure you want to continue? - + Restore Database - + Restoring database - + Database has been restored. - + Exporting Notes - + Export completed. - + Import Notes - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. @@ -1039,52 +1051,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel - + OK - + Settings - + Appearance - + Fonts - + Indexing - + Spell Check - + Connection - + Debugging - + Renso Note List @@ -1150,16 +1162,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval @@ -1169,76 +1171,76 @@ Are you sure you want to continue? Seconds between looking for unindexed notes - - - Word Parse - - - - - Regular Expression - - cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1565,57 +1567,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status - + Notebooks: - + Tags: - + Total Notes: - + Unsynchronized Notes: - + Unindexed Notes: - + Attachments/Images: - + Unindexed Attachments/Images: - + Saved Searches: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK @@ -2616,15 +2628,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -2984,43 +3011,43 @@ If you don't wish to use Evernote's then please check the option at th - + Font Color - + Font Hilight Color - + Source URL: - + Source URL: - - + + http:// - + Author: - + Unable Open - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3028,97 +3055,97 @@ and I'm too lazy to figure them out by myself. - + Error - + Error Encrypting String - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found - + A file attachment may not exceed 25MB. - + Attachment Size - - + + Save File - + Insert Hyperlink - + Edit Hyperlink - - + + Spell Check Error - + Spell Check Complete @@ -3689,506 +3716,506 @@ and I'm too lazy to figure them out by myself. - + Merge Notes - + Merge Multiple notes - + Export Selected Notes - + Export selected notes - + Copy as URL - + Import Notes - + Import notes - - - - + + + + Add - + Add a new note - + Modify Tags - + Change the tags assigned to this note - - - - + + + + Delete - + Delete this note - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note - + Find a string in the current note - + Undo - + Redo - + Cut - + Copy - + Paste - + Paste Without Formatting - + Show Note List - + Show/Hide Note List - + Show Tags - + Show/Hide Tags - + Show Notebooks - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview - + Preview Notes - + Show Saved Searches - + Show/Hide Saved Searches - + Show Attribute Searches - + Show/Hide Attribute Searches - + Show Trash - + Show/Hide Trash Tree - + Show Editor Button Bar - + Show/Hide Editor Button Bar - + Hide Left Side Panels - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left - + Left Align - + Right - + Right Align - + Center - + Center Align - + Bold - + Italic - + Underline - + Superscript - + Subscript - + Strikethrough - + Horizontal Line - + Bulleted List - + Numbered List - + Numbered list - + >> Increase - + << Decrease - - - + + + Edit - + Share With The World - + Share With Individuals - + Open/Close Notebooks - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect - + Synchronize with Evernote - + Note History - + Selective Synchronize - + Account Information - + Database Status - + Show current database information - + Disable Note Indexing - + Manually Stop Note Indexing - + Automatic Folder Importing - + Import Files Automatically - + Spell Check - + Check for spelling errors - + Encrypt Database - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4208,22 +4235,22 @@ and I'm too lazy to figure them out by myself. - + Release Notes - + Release notes - + Check For Updates - + Check for newer versions @@ -4334,47 +4361,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4613,224 +4697,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! - + Cleaning up - + Synchronizing complete - + Download syncronization complete. Uploads have been disabled. - + Synchronizing deleted notes. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. - + Downloading - + % complete. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_ja.ts b/translations/neighbornote_ja.ts index 09df014..cb70bf3 100644 --- a/translations/neighbornote_ja.ts +++ b/translations/neighbornote_ja.ts @@ -4,70 +4,71 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. シャットダウン開始. - + Performing synchronization before closing. 終了前に同期を行う。 - + Edit Notebook ノートブックの編集 - - + + Unable to Delete 削除できない - + Some of the selected notebook(s) contain notes. Please delete the notes or move them to another notebook before deleting any notebooks. 選択されたノートブックの中に、ノートが残っています。 ノートブックを削除する前に、ノートを削除するか、ほかのノートブックに移動してください。 - + You must have at least one notebook. 少なくとも一つのノートブックが必要です。 - - - - - - - - - - + + + + + + + + + + + Confirmation 確認 - + Are you sure Are you sure you wish to decrypt the database? 本当にいいですか - + Decryption Complete 復号完了 - + Decryption is complete 復号が完了しました - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -84,7 +85,7 @@ Do you wish to proceed? 続行しますか？ - + Incorrect Password 不正なパスワード @@ -93,12 +94,12 @@ Do you wish to proceed? 選択したノートブックを削除しますか? - + Delete the selected tags? 選択したタグを削除しますか? - + Edit Search 検索ワードを編集 @@ -107,7 +108,7 @@ Do you wish to proceed? これは、データベース中の未使用領域を開放します。一方、データベースの大きさに注意してください。この処理は、時間を要する処理となり、完了するまでNeverNoteが反応しなくなるかもしれません。継続しますか? - + Release Notes リリースノート @@ -134,7 +135,7 @@ Do you wish to proceed? ツールバー - + Tool Bar ツールバー @@ -151,24 +152,24 @@ Do you wish to proceed? 検索: - - + + Connect 接続 - - + + Connect to Evernote Evernoteに接続 - + Disconnect 切断 - + Disconnect from Evernote Evernoteから切断 @@ -181,17 +182,17 @@ Do you wish to proceed? ノートを再索引対象として印をつけました。 - + Database will be reindexed. データベースの索引が再作成されました。 - + Notes will be reindexed. ノートは再索引されます。 - + Note will be reindexed. ノートは再索引されます. @@ -200,24 +201,24 @@ Do you wish to proceed? 選択したノートを削除しますか? - + Error Saving Note ノートの保存時にエラー発生 - + Note has never been synchronized. ノートはまだ同期されていません。 - - - + + + Error エラー - + Unable to connect to the database. The most probable reason is that some other process @@ -235,290 +236,295 @@ Exiting program. プログラムを終了します。 - + Database Connection Error データベース接続エラー - - + + NeighborNote NeighborNote - + Renso Note List 連想ノートリスト - + Show/Hide 表示/非表示 - + Exit 終了 - + Add Note ノート追加 - + Are you sure 本当にいいですか - + Are you sure you wish to encrypt the database? 本当にデータベースを暗号化してもよろしいですか？ - + Encryption Complete 暗号化完了 - + Encryption is complete 暗号化が完了しました - + Database Decryption データベース復号 - + Synchronizing. Please be patient. 同期中。しばらくお待ちください。 - + Empty res directory purge failed - - + + Unable To Stack スタックにできません - + You can't stack the "All Notebooks" item. All Notebooksアイテムはスタックにできません。 - + You can't stack a stack. スタックをスタックにすることはできません。 - + Edit Stack スタック編集 - + Delete selected notebooks? 選択したノートブックを削除しますか？ - + Remove selected stacks (notebooks will not be deleted)? 選択したスタックを削除しますか（ノートブックは削除されません）？ - + Delete selected notebooks & remove stacks? Notebooks under the stacks are not deleted unless selected? 選択されたノートブックを削除＆スタックを除去しますか？　選択肢ない限り、そのスタックに属するノートブックは削除されません？ - + Delete the selected search? 選択された検索を削除しますか？ - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? これはデータベース内の未使用領域を開放しますが、データベースのサイズによっては時間がかかることがあり、完了するまでソフトウェアが応答しなくなることがあるので注意してください。続行しますか？ - + About NeighborNote NeighborNoteについて - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous 前へ - + Next 次へ - + Up 上へ - + Down 下へ - - + + Synchronize 同期 - - + + Print 印刷 - - + + Tag タグ - + Attributes 属性 - - + + Email 電子メール - - + + Delete 削除 - + New 新規 - - + + All Notes すべてのノート - + Previous Arrow 前へ矢印 - + Next Arrow 次へ矢印 - + Up Arrow 上へ矢印 - + Down Arrow 下へ矢印 - + Attribute 属性 - + Add 追加 - + Search Clear 検索をクリア - + Invalid authorization token received. 無効な認証トークンを受信しました。 - + + Are you sure you want to enable the auto-login feature? + 自動ログイン機能を有効にしますか？ + + + Note Not Found ノートが見つかりません - + Sorry, but I can't seem to find that note. 申し訳ありませんが、そのノートを見つけることができないようです。 - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. NeighborNoteがこのノートのフォーマットする際に問題が発生しました。あなたのデータを保護するために、このノートは読み取り専用に設定されます。 - + Delete 削除 - + Delete note " ノートを削除 - + Delete note selected note? 選択されたノートを削除しますか？ - + Permanently delete 完全削除 - + Permanently delete note " ノートを完全削除 - + Permanently delete note selected note? 選択されたノートを完全削除しますか？ - + An error has happened while saving the note " ノートの保存中にエラーが発生しました。 - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -530,57 +536,57 @@ be lost. Please review the note to recover any critical data before restarting. キャッシュされたコピーは、任意のデータを回復できるように保存されますが、データが失われる可能性があります。再起動する前に、重要なデータを回復するためにノートを確認してください。 - + This note has never been sent to Evernote, so there is no history. このノートは、Evernoteに送られたことがありません。したがって、過去の記録がありません。 - + Getting Note History ノートの過去の記録を取得する - + Note not found on server. サーバにノートが見つかりませんでした。 - + This note could not be found on Evernote's servers. このノートをEvernoteのサーバー上で見つけることができませんでした。 - + History retrieved 記録取得 - + Restoring as new note. 新しいノートとして復元する。 - + Note has been restored as a new note. ノートは新しいノートとして復元されました。 - + Restoring note. ノートの復元。 - + Note has been restored. ノートは復元されました。 - + DOUGH!!! ああっ!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -599,104 +605,110 @@ Who knows, you might get lucky. - + Finalizing Synchronization 同期の終了処理 - + Synchronization Complete 同期完了 - + Synchronization completed with errors. Please check the log for details. 同期がエラーで完了しました。詳細については、ログを確認してください。 - + Indexing notes ノートの索引作成 - + Index complete 索引作成完了 - - - - - - + + + + + + + A thread has died. スレッドが停止しました。 - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - 申し訳ありません。タグカウンタスレッドが停止したようです。NeighborNoteを停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 + 申し訳ありません。タグカウンタスレッドが停止したようです。NeighborNoteの停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - 申し訳ありません。ノートブックカウンタスレッドが停止したようです。NeighborNoteを停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 + 申し訳ありません。ノートブックカウンタスレッドが停止したようです。NeighborNoteの停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - 申し訳ありません。ノート保存スレッドが停止したようです。NeighborNoteを停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 + 申し訳ありません。ノート保存スレッドが停止したようです。NeighborNoteの停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - 申し訳ありません。同期スレッドが停止したようです。NeighborNoteを停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 + 申し訳ありません。同期スレッドが停止したようです。NeighborNoteの停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - 申し訳ありません。索引スレッドが停止したようです。NeighborNoteを停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 + 申し訳ありません。索引スレッドが停止したようです。NeighborNoteの停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + 申し訳ありません。Evernote関連ノートスレッドが停止したようです。NeighborNoteの停止を確認し、後で確認できるようにログを保存し、再起動することをおすすめします。 + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. インポート完了。 - + Please Synchronize 同期してください - + Please either synchronize or move any new notes to a local notebook. 同期または新しく作成したノートをローカルノートブックに移動してください。 - + No Response from CodeCogs CodeCogsから応答がありません - + Unable to contact CodeCogs for LaTeX formula. LaTeXの式をCodeCogsに問い合わせることができません。 - + Exclude note " ノート除外 - + Exclude note selected note? 選択されたノートを除外しますか？ @@ -709,12 +721,12 @@ Who knows, you might get lucky. ノートの索引作成。 - + Indexing is now enabled. 索引作成は有効にされました。 - + Indexing is now disabled. 索引作成は無効にされました。 @@ -743,8 +755,8 @@ Who knows, you might get lucky. 索引作成・スレッドが死んだようです。NeverNoteを停止し、原因究明のためログを保存し、再起動することをおすすめします。ごめんなさい。 - - + + Backup Database データベースバックアップ @@ -753,17 +765,17 @@ Who knows, you might get lucky. Nevernoteエキスポート(*.nnex);;すべてのファイル(*.*) - + Backing up database データベースバックアップ - + Database backup completed. データベースのバックアップ完了。 - + 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 @@ -777,52 +789,52 @@ Are you sure you want to continue? 本当に継続しますか? - + Restore Database データベース復元 - + Restoring database データベースを復元します - + Database has been restored. データベースは復元されました。 - + Exporting Notes ノートの書き出し - + Export completed. 書き出し完了。 - + Import Notes ノートの取り込み - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes ノートをインポート中 - + Create new tags from import? インポートから新しいタグを作成しますか？ - + Notes have been imported. ノートは取り込まれました。 @@ -1163,47 +1175,47 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel キャンセル - + OK OK - + Settings 設定 - + Appearance 見え方 - + Fonts フォント - + Indexing 索引作成 - + Spell Check スペルチェック - + Connection 接続 - + Renso Note List 連想ノートリスト @@ -1216,7 +1228,7 @@ Are you sure you want to continue? 編集ボタンを隠す - + Debugging デバッグ @@ -1265,12 +1277,12 @@ Are you sure you want to continue? Recognition - + 認識 Minimum Recognition Weight - + 最小の認識ウェイト @@ -1298,14 +1310,8 @@ Are you sure you want to continue? 画像認識の索引作成 - - Automatically Wildcard All Searches - - - - Special Word Characters - 特殊単語文字 + 特殊単語文字 @@ -1318,75 +1324,87 @@ Are you sure you want to continue? 索引が作成されていないノートを探している間の秒数 - Word Parse - 単語の認識 + 単語の認識 - Regular Expression - 正規表現 + 正規表現 cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - Browse Weight + 同時閲覧の重み + + + + Concurrent Browse Weight 同時閲覧の重み - + Copy&Paste Weight コピー&ペーストの重み - + Add New Note Weight 新規ノート追加の重み - + Renso Item Click Weight 連想ノートクリックの重み - + Same Tag Weight 同じタグの重み - + Same Notebook Weight 同じノートブックの重み - + + Evernote Related Notes Weight + Evernote関連ノートの重み + + + Weighting 重み付け - + + You can change these settings if you select "Custom" Mode. + "カスタム"モードを選択すればこの設定を変更することが出来ます。 + + + When you merge the notes, also merge RensoNoteList ノートをマージした時、連想ノートリストもマージ - + When you duplicate the notes, also duplicate RensoNoteList ノートを複製した時、連想ノートリストも複製 - + Verify when you exclude the note ノートを除外するときに確認 - + Renso Note List Item Maximum 連想ノートリスト最大表示アイテム数 - + Others その他 @@ -1621,27 +1639,27 @@ Are you sure you want to continue? Ignore words with numbers in them - + 数字が含まれているワードを無視する Ignore internet addresses (i.e. http:// ftp://) - + インターネットアドレスを無視する (i.e. http:// ftp://) Ignore words with upper and lower cased letters - + 大文字と小文字が含まれるワードを無視する Ignore upper cased words - + 大文字のワードを無視する Ignore that sentences should begin with a capital letter - + 大文字で始めるべき文章を無視する @@ -1713,57 +1731,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status 現在のデータベースの状態 - + Notebooks: ノートブック: - + Tags: タグ: - + Total Notes: 全ノート: - + Unsynchronized Notes: 同期されていないノート: - + Unindexed Notes: 索引前ノート: - + Attachments/Images: 添付/画像: - + Unindexed Attachments/Images: 索引作成されていない添付ファイル/画像: - + Saved Searches: 保存された検索: - + Words In Index 索引中の単語: - + + Tobal Behavior History: + 操作履歴の合計: + + + + Renso Note Click: + 連想ノートクリック数: + + + OK OK @@ -1874,12 +1902,12 @@ Are you sure you want to continue? Forward - + 進む Backward - + 戻る @@ -2315,7 +2343,7 @@ Are you sure you want to continue? / - + @@ -2798,15 +2826,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available アップグレードが利用できます - + Automatically check for updates at startup 起動時に自動的にアップデートを確認 + + + Do you want to download now? + 今すぐダウンロードしますか？ + + + + Yes + はい + + + + No + いいえ + cx.fbn.nevernote.dialog.WatchFolder @@ -3038,7 +3081,7 @@ If you don't wish to use Evernote's then please check the option at th Altered: - + 変更日: @@ -3166,43 +3209,43 @@ If you don't wish to use Evernote's then please check the option at th To-Do - + Font Color フォントの色 - + Font Hilight Color フォントのハイライト色 - + Source URL: ソースURL: - + Source URL: ソースURL: - - + + http:// http:// - + Author: 作者: - + Unable Open 開くのに失敗 - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3211,60 +3254,60 @@ and I'm too lazy to figure them out by myself. インクノートは、Evernoteが仕様を公開しないうちはサポートされません。 - + Error エラー - + Error Encrypting String 文字列の暗号化に失敗 - + No Matches Found マッチするものが見つかりません - + No matching notes found. マッチするノートが見つかりませんでした。 - + Incorrect Password 不正なパスワード - + The password entered is not correct 入力されたパスワードが正しくありません - - - + + + Untitled Note タイトルのないノート - - + + Dictionary 辞書 - + .dic was not found. .dic が見つかりませんでした。 - + .dic is invalid. .dic が無効です。 - + No Errors Found エラーは見つかりませんでした @@ -3277,39 +3320,39 @@ and I'm too lazy to figure them out by myself. プレミアム契約ではない - + A file attachment may not exceed 25MB. ファイル添付は、25MBを超えられません。 - + Attachment Size 添付のサイズ - - + + Save File ファイルの保存 - + Insert Hyperlink ハイパーリンクの挿入 - + Edit Hyperlink ハイパーリンクの編集 - - + + Spell Check Error スペルチェックエラー - + Spell Check Complete スペルチェック完了 @@ -3880,513 +3923,513 @@ and I'm too lazy to figure them out by myself. このノートの複製 - + Merge Notes ノートの結合 - + Merge Multiple notes 複数ノートの結合 - + Export Selected Notes 選択したーノートを書き出し - + Export selected notes 選択したノートを書き出し - + Copy as URL URLとしてコピー - + Import Notes ノートの取り込み - + Import notes ノートの取り込み - - - - + + + + Add 追加 - + Add a new note 新規ノートの追加 - + Modify Tags タグの変更 - + Change the tags assigned to this note このノートに割り当てられたタグの変更 - - - - + + + + Delete 削除 - + Delete this note このノートの削除 - + Open in New Tab 新しいタブで開く - + Open this note in new tab このノートを新しいタブで開く - + Add in New Tab 新しいタブで新規ノート追加 - + Add a new note in new tab 新しいタブで新規ノートを追加 - + Find In Note ノート内を検索 - + Find a string in the current note 現在のノートで文字列を検索する - + Undo 元に戻す - + Redo やり直す - + Cut 切り取り - + Copy コピー - + Paste 貼り付け - + Paste Without Formatting 書式なしで貼り付け - + Show Note List ノート一覧を表示 - + Show/Hide Note List ノート一覧の表示/非表示 - + Show Tags タグを表示 - + Show/Hide Tags タグの表示/非表示 - + Show Notebooks ノートブックを表示 - + Show/Hide Notebooks ノートブックの表示/非表示 - + Show Zoom ズームを表示 - + Show/Hide Zoom ズームの表示/非表示 - + Show Quota Bar クォータバーを表示 - + Show/Hide Quota クォータバーの表示/非表示 - + Show Search Box 検索ボックスを表示 - + Show/Hide Search Box 検索ボックスの表示/非表示 - + Wide List View ワイドリストビュー - + Narrow List View ナローリストビュー - + Preview プレビュー - + Preview Notes ノートのプレビュー - + Show Saved Searches 保存した検索を表示 - + Show/Hide Saved Searches 保存した検索の表示/非表示 - + Show Attribute Searches 属性検索を表示 - + Show/Hide Attribute Searches 属性検索の表示/非表示 - + Show Trash ゴミ箱を表示 - + Show/Hide Trash Tree ゴミ箱ツリーの表示/非表示 - + Show Editor Button Bar エディターのボタンバーを表示 - + Show/Hide Editor Button Bar エディタボタンバーの表示/非表示 - + Hide Left Side Panels 左サイドパネルを隠す - + Hide The Entire Left Side すべての左サイドを隠す - + View Source ソースを表示 - + View the source HTML for a note ノートのソースHTMLを表示 - + Left 左 - + Left Align 左寄せ - + Right 右 - + Right Align 右寄せ - + Center 中央 - + Center Align 中央寄せ - + Bold 太字 - + Italic イタリック体 - + Underline 下線 - + Superscript 上添え字 - + Subscript 下添え字 - + Strikethrough - + Horizontal Line 水平線 - + Bulleted List 箇条書き - + Numbered List 番号リスト - + Numbered list 番号リスト - + >> Increase >> 増加 - + << Decrease << 削減 - - - + + + Edit 編集 - + Share With The World 世界と共有 - + Share With Individuals 個人と共有 - + Open/Close Notebooks ノートブックの表示/非表示 - - - + + + Change Icon アイコン変更 - + Set Stack スタック設定 - + Merge Tags タグのマージ - + Connect 接続 - + Synchronize with Evernote Evernote と同期 - + Note History ノートの経緯 - + Selective Synchronize 選択的同期 - + Account Information アカウント情報 - + Database Status データベースの状態 - + Show current database information 現在のデータベース情報の表示 - + Disable Note Indexing ノート索引作成の無効化 - + Manually Stop Note Indexing 手動でノートの索引作成を停止 - + Automatic Folder Importing 自動フォルダー取り込み - + Import Files Automatically 自動でファイルをインポート - + Spell Check スペルチェック - + Check for spelling errors スペルエラーをチェック - + Encrypt Database データベースを暗号化 - + Encrypt the database upon shutdown シャットダウン時にデータベースを暗号化 - + Logs ログ - + Show the detailed application log アプリケーションログの詳細を表示 F&ormat - + フォーマット(&O) @@ -4403,22 +4446,22 @@ and I'm too lazy to figure them out by myself. ログ - + Release Notes リリースノート - + Release notes リリースノート - + Check For Updates アップデートを確認 - + Check for newer versions 新しいバージョンを確認 @@ -4537,47 +4580,122 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab 新しいタブで開く - + Open this note in new tab このノートを新しいタブで開く - - STAR + + Add Star スターを付ける - - Star this item + + Add Star to this item このアイテムにスターを付ける - - UNSTAR + + Remove Star スターを外す - + + Remove Star from this item + このアイテムからスターを外す + + + STAR + スターを付ける + + + Star this item + このアイテムにスターを付ける + + + UNSTAR + スターを外す + + Unstar this item - このアイテムのスターを外す + このアイテムのスターを外す - + Exclude 除外 - + Exclude this note from RensoNoteList このノートを連想ノートリストから除外する + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + モード: + + + + + Preset Weighting Mode + プリセット重み付けモード + + + + Standard + スタンダード + + + + Concurrent Browse + 同時閲覧重視 + + + + Content Similarity + コンテンツ類似性重視 + + + + Custom + カスタム + + + + Halt Collectiong Operation Log + 操作ログの収集を停止する + + + + + Information + 情報 + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + カスタムモードが選択されました。 +編集/設定/連想ノートリスト から重み付けを手動で設定することが出来ます。 + + + + Collecting operation log halted. +You can resume, if you press this button again. + 操作ログの収集を停止しました。 +このボタンをもう一度押すと再開できます。 + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4820,224 +4938,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. 同期エラー - 詳細はログを参照してください。 - + Synchronizing with Evernote Evernoteと同期 - + User exception getting user account information. Aborting sync and disconnecting ユーザアカウント情報を取得する際に例外が発生。同期を中止し、切断します - + System error user account information. Aborting sync and disconnecting! ユーザアカウント情報でシステムエラー。同期を中止し、切断します! - + Transaction error getting user account information. Aborting sync and disconnecting! ユーザアカウント情報取得時にトランザクションエラー発生。 同期を中止し、切断しました！ - - - + + + Error getting sync state! Aborting sync and disconnecting! 同期ステータスの取得時にエラー発生！ 同期を中止し、切断しました！ - + Syncronization Error! 同期エラー！ - + Cleaning up クリーンアップ - + Synchronizing complete 同期完了 - + Download syncronization complete. Uploads have been disabled. 同期のダウンロード完了。 アップロードが無効になっています。 - + Synchronizing deleted notes. 削除されたノートの同期中。 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: エラー: - - - - + + + + Error sending local note: ローカルノートの送信中にエラー発生。 - - + + Sending local notes. ローカルノートを送信中。 - + Sending local notebooks. ローカルノートブックを送信中 - + Sending local tags. ローカルタグを送信中。 - + Sending saved searches. 保存された検索を送信中。 - + Downloading 0% complete. ダウンロード 0% 完了。 - + Downloading ダウンロード中 - + % complete. % 完了。 - + Connection Error 接続エラー - + Error retrieving user information. Synchronization not complete ユーザ情報の取得中にエラー発生。 同期は完了していません - + User exception Listing shared notebooks. 共有ノートブックのリスト化中にUser exception発生。 - + System exception Listing shared notebooks. 共有ノートブックのリスト化中にSystem exception発生。 - + Transaction exception Listing shared notebooks. 共有ノートブックのリスト化中にTransaction exception発生。 - + EDAM Not Found exception Listing shared notebooks. 共有ノートブックのリスト化中にEDAM Not Found exception発生。 - + User exception Listing notebooks. ノートブックのリスト化中にUser exception発生。 - + System exception Listing notebooks. ノートブックのリスト化中にSystem exception発生。 - + Transaction exception Listing notebooks. ノートブックのリスト化中にTransaction exception発生。 - + User exception Listing linked notebooks. リンクノートブックのリスト化中にUser exception発生。 - + System exception Listing linked notebooks. リンクノートブックのリスト化中にSystem exception発生。 - + Transaction exception Listing lineked notebooks. リンクノートブックのリスト化中にTransaction exception発生。 - + EDAM Not Found exception Listing linked notebooks. リンクノートブックのリスト化中にEDAM Not Found exception発生。 - + Synchronizing shared notebooks. 共有ノートブックを同期中。 - + EDAM UserException synchronizing linked notbook. See the log for datails. リンクノートブックの同期中にEDAM UserException発生。 詳細はログを確認してください。 - + EDAM UserException synchronizing linked notbook リンクノートブックの同期中にEDAM UserException発生。 - + EDAM SystemException synchronizing linked notbook. See the log for datails. リンクノートブックの同期中にEDAM SystemException発生。 詳細はログを確認してください。 - + EDAM SystemException synchronizing linked notbook. See the log for datails リンクノートブックの同期中にEDAM SystemException発生。 詳細はログを確認してください。 - + Notebook URL not found. Removing notobook ノートブックの削除中にノートブックのURLが見つかりませんでした - - + + EDAM TException synchronizing linked notbook. See the log for datails. リンクノートブックの同期中にEDAM TException発生。 詳細はログを確認してください。 diff --git a/translations/neighbornote_pl.ts b/translations/neighbornote_pl.ts index dc1b105..d89fbf5 100644 --- a/translations/neighbornote_pl.ts +++ b/translations/neighbornote_pl.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. - + Performing synchronization before closing. @@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not - - + + - - - - - + + + + + + Confirmation - + Are you sure Are you sure you wish to decrypt the database? - + Decryption Complete - + Decryption is complete - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -78,7 +79,7 @@ Do you wish to proceed? - + Incorrect Password @@ -93,71 +94,71 @@ Do you wish to proceed? - + Release Notes - + Tool Bar - - + + Connect - - + + Connect to Evernote - + Disconnect - + Disconnect from Evernote - + Database will be reindexed. - + Notes will be reindexed. - + Note will be reindexed. - + Error Saving Note - + Note has never been synchronized. - - - + + + Error - + Unable to connect to the database. The most probable reason is that some other process @@ -169,58 +170,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit - + Add Note - + Are you sure - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -276,183 +277,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print - - + + Tag - + Attributes - - + + Email - - + + Delete - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -462,57 +468,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. - + Getting Note History - + Note not found on server. - + This note could not be found on Evernote's servers. - + History retrieved - + Restoring as new note. - + Note has been restored as a new note. - + Restoring note. - + Note has been restored. - + DOUGH!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -531,135 +537,141 @@ Who knows, you might get lucky. - + Finalizing Synchronization - + Synchronization Complete - + Synchronization completed with errors. Please check the log for details. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? - + Indexing is now enabled. - + Indexing is now disabled. - - + + Backup Database - + Backing up database - + Database backup completed. - + 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 @@ -669,52 +681,52 @@ Are you sure you want to continue? - + Restore Database - + Restoring database - + Database has been restored. - + Exporting Notes - + Export completed. - + Import Notes - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. @@ -1039,52 +1051,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel - + OK - + Settings - + Appearance - + Fonts - + Indexing - + Spell Check - + Connection - + Debugging - + Renso Note List @@ -1150,16 +1162,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval @@ -1169,76 +1171,76 @@ Are you sure you want to continue? Seconds between looking for unindexed notes - - - Word Parse - - - - - Regular Expression - - cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1565,57 +1567,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status - + Notebooks: - + Tags: - + Total Notes: - + Unsynchronized Notes: - + Unindexed Notes: - + Attachments/Images: - + Unindexed Attachments/Images: - + Saved Searches: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK @@ -2616,15 +2628,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -2984,43 +3011,43 @@ If you don't wish to use Evernote's then please check the option at th - + Font Color - + Font Hilight Color - + Source URL: - + Source URL: - - + + http:// - + Author: - + Unable Open - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3028,97 +3055,97 @@ and I'm too lazy to figure them out by myself. - + Error - + Error Encrypting String - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found - + A file attachment may not exceed 25MB. - + Attachment Size - - + + Save File - + Insert Hyperlink - + Edit Hyperlink - - + + Spell Check Error - + Spell Check Complete @@ -3689,506 +3716,506 @@ and I'm too lazy to figure them out by myself. - + Merge Notes - + Merge Multiple notes - + Export Selected Notes - + Export selected notes - + Copy as URL - + Import Notes - + Import notes - - - - + + + + Add - + Add a new note - + Modify Tags - + Change the tags assigned to this note - - - - + + + + Delete - + Delete this note - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note - + Find a string in the current note - + Undo - + Redo - + Cut - + Copy - + Paste - + Paste Without Formatting - + Show Note List - + Show/Hide Note List - + Show Tags - + Show/Hide Tags - + Show Notebooks - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview - + Preview Notes - + Show Saved Searches - + Show/Hide Saved Searches - + Show Attribute Searches - + Show/Hide Attribute Searches - + Show Trash - + Show/Hide Trash Tree - + Show Editor Button Bar - + Show/Hide Editor Button Bar - + Hide Left Side Panels - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left - + Left Align - + Right - + Right Align - + Center - + Center Align - + Bold - + Italic - + Underline - + Superscript - + Subscript - + Strikethrough - + Horizontal Line - + Bulleted List - + Numbered List - + Numbered list - + >> Increase - + << Decrease - - - + + + Edit - + Share With The World - + Share With Individuals - + Open/Close Notebooks - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect - + Synchronize with Evernote - + Note History - + Selective Synchronize - + Account Information - + Database Status - + Show current database information - + Disable Note Indexing - + Manually Stop Note Indexing - + Automatic Folder Importing - + Import Files Automatically - + Spell Check - + Check for spelling errors - + Encrypt Database - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4208,22 +4235,22 @@ and I'm too lazy to figure them out by myself. - + Release Notes - + Release notes - + Check For Updates - + Check for newer versions @@ -4334,47 +4361,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4613,224 +4697,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! - + Cleaning up - + Synchronizing complete - + Download syncronization complete. Uploads have been disabled. - + Synchronizing deleted notes. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. - + Downloading - + % complete. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_pt.ts b/translations/neighbornote_pt.ts index a630736..193c2c4 100644 --- a/translations/neighbornote_pt.ts +++ b/translations/neighbornote_pt.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. - + Performing synchronization before closing. @@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not - - + + - - - - - + + + + + + Confirmation - + Are you sure Are you sure you wish to decrypt the database? - + Decryption Complete - + Decryption is complete - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -78,7 +79,7 @@ Do you wish to proceed? - + Incorrect Password @@ -93,71 +94,71 @@ Do you wish to proceed? - + Release Notes - + Tool Bar - - + + Connect - - + + Connect to Evernote - + Disconnect - + Disconnect from Evernote - + Database will be reindexed. - + Notes will be reindexed. - + Note will be reindexed. - + Error Saving Note - + Note has never been synchronized. - - - + + + Error - + Unable to connect to the database. The most probable reason is that some other process @@ -169,58 +170,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit - + Add Note - + Are you sure - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -276,183 +277,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print - - + + Tag - + Attributes - - + + Email - - + + Delete - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -462,57 +468,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. - + Getting Note History - + Note not found on server. - + This note could not be found on Evernote's servers. - + History retrieved - + Restoring as new note. - + Note has been restored as a new note. - + Restoring note. - + Note has been restored. - + DOUGH!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -531,135 +537,141 @@ Who knows, you might get lucky. - + Finalizing Synchronization - + Synchronization Complete - + Synchronization completed with errors. Please check the log for details. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? - + Indexing is now enabled. - + Indexing is now disabled. - - + + Backup Database - + Backing up database - + Database backup completed. - + 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 @@ -669,52 +681,52 @@ Are you sure you want to continue? - + Restore Database - + Restoring database - + Database has been restored. - + Exporting Notes - + Export completed. - + Import Notes - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. @@ -1039,52 +1051,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel - + OK - + Settings - + Appearance - + Fonts - + Indexing - + Spell Check - + Connection - + Debugging - + Renso Note List @@ -1150,16 +1162,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval @@ -1169,76 +1171,76 @@ Are you sure you want to continue? Seconds between looking for unindexed notes - - - Word Parse - - - - - Regular Expression - - cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1565,57 +1567,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status - + Notebooks: - + Tags: - + Total Notes: - + Unsynchronized Notes: - + Unindexed Notes: - + Attachments/Images: - + Unindexed Attachments/Images: - + Saved Searches: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK @@ -2616,15 +2628,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -2984,43 +3011,43 @@ If you don't wish to use Evernote's then please check the option at th - + Font Color - + Font Hilight Color - + Source URL: - + Source URL: - - + + http:// - + Author: - + Unable Open - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3028,97 +3055,97 @@ and I'm too lazy to figure them out by myself. - + Error - + Error Encrypting String - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found - + A file attachment may not exceed 25MB. - + Attachment Size - - + + Save File - + Insert Hyperlink - + Edit Hyperlink - - + + Spell Check Error - + Spell Check Complete @@ -3689,506 +3716,506 @@ and I'm too lazy to figure them out by myself. - + Merge Notes - + Merge Multiple notes - + Export Selected Notes - + Export selected notes - + Copy as URL - + Import Notes - + Import notes - - - - + + + + Add - + Add a new note - + Modify Tags - + Change the tags assigned to this note - - - - + + + + Delete - + Delete this note - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note - + Find a string in the current note - + Undo - + Redo - + Cut - + Copy - + Paste - + Paste Without Formatting - + Show Note List - + Show/Hide Note List - + Show Tags - + Show/Hide Tags - + Show Notebooks - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview - + Preview Notes - + Show Saved Searches - + Show/Hide Saved Searches - + Show Attribute Searches - + Show/Hide Attribute Searches - + Show Trash - + Show/Hide Trash Tree - + Show Editor Button Bar - + Show/Hide Editor Button Bar - + Hide Left Side Panels - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left - + Left Align - + Right - + Right Align - + Center - + Center Align - + Bold - + Italic - + Underline - + Superscript - + Subscript - + Strikethrough - + Horizontal Line - + Bulleted List - + Numbered List - + Numbered list - + >> Increase - + << Decrease - - - + + + Edit - + Share With The World - + Share With Individuals - + Open/Close Notebooks - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect - + Synchronize with Evernote - + Note History - + Selective Synchronize - + Account Information - + Database Status - + Show current database information - + Disable Note Indexing - + Manually Stop Note Indexing - + Automatic Folder Importing - + Import Files Automatically - + Spell Check - + Check for spelling errors - + Encrypt Database - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4208,22 +4235,22 @@ and I'm too lazy to figure them out by myself. - + Release Notes - + Release notes - + Check For Updates - + Check for newer versions @@ -4334,47 +4361,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4613,224 +4697,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! - + Cleaning up - + Synchronizing complete - + Download syncronization complete. Uploads have been disabled. - + Synchronizing deleted notes. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. - + Downloading - + % complete. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_ru.ts b/translations/neighbornote_ru.ts index 7f60fec..dcf7236 100644 --- a/translations/neighbornote_ru.ts +++ b/translations/neighbornote_ru.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. Выключение. - + Performing synchronization before closing. Выполняется синхронизация перед закрытием программы. @@ -37,37 +37,38 @@ Please delete the notes or move them to another notebook before deleting any not Должен быть хотя бы один блокнот. - - + + - - - - - + + + + + + Confirmation Подтверждение - + Are you sure Are you sure you wish to decrypt the database? Вы уверены - + Decryption Complete Расшифровка завершена - + Decryption is complete Расшифровка завершена - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -86,7 +87,7 @@ Do you wish to proceed? Вы хотите продолжить? - + Incorrect Password Неправильный пароль @@ -109,7 +110,7 @@ Do you wish to proceed? Это позволит высвободить неиспользуемое место в базе данных, но имейте в виду, что в зависимости от размера базы данных операция может занять много времени и NeverNote не будет отвечать, пока она не будет завершена. Вы хотите продолжить? - + Release Notes Комментарии к релизам @@ -130,7 +131,7 @@ Do you wish to proceed? <hr></center>Evernote Клиент для Evernote с открытым исходным кодом.<br><br>Лицензия GPL версия 2. <br><hr><br>Copyright 2001-2010 Корпорация Evernote<br>Jambi и QT зарегестрированные торговые марки корпорации Nokia <br>PDFRenderer распространяется по лицензии LGPL<br>JTidy защищена авторским правом консорциумом World Wide Web<br>Apache Common Utilities распространяются по лицензии Apache версии 2.0<br>Jazzy распространяется по лицензии LGPL<br>Java зарегестрированная торговая марка корпорации Oracle.<br><hr> - + Tool Bar Панель инструментов @@ -147,24 +148,24 @@ Do you wish to proceed? Поиск: - - + + Connect Соединиться - - + + Connect to Evernote Соединиться с Evernote - + Disconnect Отключиться - + Disconnect from Evernote Отключиться от Evernote @@ -177,17 +178,17 @@ Do you wish to proceed? Выберите заметки для переиндексации. - + Database will be reindexed. База данных будет переиндесирована. - + Notes will be reindexed. Заметки будут переиндексированы. - + Note will be reindexed. Заметка будет переиндексирована. @@ -196,24 +197,24 @@ Do you wish to proceed? Удалить выбранные заметки? - + Error Saving Note Ошибка при сохранении заметки - + Note has never been synchronized. Заметка никогда не синхронизировалась. - - - + + + Error Ошибка - + Unable to connect to the database. The most probable reason is that some other process @@ -225,58 +226,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit Выход - + Add Note - + Are you sure Вы уверены - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -332,183 +333,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print Печать - - + + Tag Метка - + Attributes Свойства поиска - - + + Email Отправить по почте - - + + Delete Удалить - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add Добавить - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -518,57 +524,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. Заметка никогда не синхронизировалась с Evernote, поэтому у неё нет истории. - + Getting Note History Получение истории заметки - + Note not found on server. Заметка не найдена на сервере. - + This note could not be found on Evernote's servers. - + History retrieved Поиск истории заметки - + Restoring as new note. Заметка восстанавливается как новая. - + Note has been restored as a new note. Заметка восстановлена как новая заметка. - + Restoring note. Восстановление заметки. - + Note has been restored. Заметка восстановлена. - + DOUGH!!! Чёрт!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -601,104 +607,110 @@ P.S. Вы можете попробовать повторно синхрони возможно это исправит проблему. - + Finalizing Synchronization Завершение синхронизации - + Synchronization Complete Синхронизация выполнена - + Synchronization completed with errors. Please check the log for details. Синхронизация завершена с ошибками. Подробнее смотрите в лог-файле. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? @@ -711,12 +723,12 @@ P.S. Вы можете попробовать повторно синхрони Индексация заметок. - + Indexing is now enabled. Индексация включена. - + Indexing is now disabled. Индексация выключена. @@ -745,8 +757,8 @@ P.S. Вы можете попробовать повторно синхрони Похоже, что тред индексации не выполняется Я рекомендую попробовать остановить NeverNote, сохранить лог-файлы, и перезапусить программу. Извините. - - + + Backup Database Резервное копирование базы данных @@ -755,17 +767,17 @@ P.S. Вы можете попробовать повторно синхрони Экспорт файлов NeverNote (*.nnex);;Все файлы (*.*) - + Backing up database Резервное копирование базы данных - + Database backup completed. Резервное копирование базы данных завершено. - + 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 @@ -780,52 +792,52 @@ Are you sure you want to continue? Вы уверены, что хотите продолжить? - + Restore Database Восстановление базы данных - + Restoring database Восстановление базы данных - + Database has been restored. Восстановление базы данных завершено. - + Exporting Notes Экспорт заметок - + Export completed. Экспорт завершён. - + Import Notes Импорт заметок - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. Заметки были импортированы. @@ -1166,52 +1178,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel Отмена - + OK OK - + Settings Настройки - + Appearance Внешний вид - + Fonts - + Indexing Индексация - + Spell Check Проверка орфографии - + Connection Соединение - + Debugging Отладка - + Renso Note List @@ -1293,16 +1305,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval Интервал индексирования @@ -1313,75 +1315,83 @@ Are you sure you want to continue? Секунд между поиском непроиндексированных заметок - Word Parse - Разбор слов + Разбор слов - Regular Expression - Регулярные выражения + Регулярные выражения cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1708,57 +1718,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status Состояние базы данных - + Notebooks: Блокнотов: - + Tags: Меток: - + Total Notes: Заметок: - + Unsynchronized Notes: Несинхронизированных заметок: - + Unindexed Notes: Непроиндексированных заметок: - + Attachments/Images: Вложений/изображений: - + Unindexed Attachments/Images: - + Saved Searches: Сохранённых запросов: - + Words In Index Слов в индексе - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK OK @@ -2786,15 +2806,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -3154,43 +3189,43 @@ If you don't wish to use Evernote's then please check the option at th Задача - + Font Color Цвет текста - + Font Hilight Color Цвет выделенного текста - + Source URL: Адрес источника: - + Source URL: Адрес источника: - - + + http:// http:// - + Author: Автор: - + Unable Open Невозможно открыть - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3201,60 +3236,60 @@ and I'm too lazy to figure them out by myself. и я слишком ленив, чтобы понять их самостоятельно. - + Error Ошибка - + Error Encrypting String Ошибка шифрования текста - + No Matches Found - + No matching notes found. - + Incorrect Password Неправильный пароль - + The password entered is not correct - - - + + + Untitled Note Новая заметка - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found @@ -3267,34 +3302,34 @@ and I'm too lazy to figure them out by myself. Бесплатный аккаунт - + A file attachment may not exceed 25MB. Размер вложений не может превышать 25 МВ. - + Attachment Size Размер вложения - - + + Save File Сохранить файл - + Insert Hyperlink Вставить гиперссылку - + Edit Hyperlink Редактировать гиперссылку - - + + Spell Check Error Ошибка проверки орфографии @@ -3307,7 +3342,7 @@ Please place the cursor at the beginning & try again Установите курсор в начало документа и попробуйте ещё раз - + Spell Check Complete Проверка орфографии завершена @@ -3882,506 +3917,506 @@ Please place the cursor at the beginning & try again Копировать заметку - + Merge Notes Объединить заметки - + Merge Multiple notes Объединить разные заметки - + Export Selected Notes Экспорт выделенных заметок - + Export selected notes Экспорт выделенных заметок - + Copy as URL - + Import Notes Импорт заметок - + Import notes Импорт заметок - - - - + + + + Add Добавить - + Add a new note Новая заметка - + Modify Tags Присвоить метки - + Change the tags assigned to this note Изменить метки, назначенные заметке - - - - + + + + Delete Удалить - + Delete this note Удалить заметку - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note Найти внутри заметки - + Find a string in the current note Найти строчку внутри текущей заметки - + Undo Отменить - + Redo Вернуть - + Cut Вырезать - + Copy Копировать - + Paste Вставить - + Paste Without Formatting Вставить как текст - + Show Note List Показать список заметок - + Show/Hide Note List - + Show Tags Показать список меток - + Show/Hide Tags - + Show Notebooks Показать список блокнотов - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview Предварительный просмотр - + Preview Notes - + Show Saved Searches Показать сохранённые запросы - + Show/Hide Saved Searches - + Show Attribute Searches Показать свойства поиска - + Show/Hide Attribute Searches - + Show Trash Показать корзину - + Show/Hide Trash Tree - + Show Editor Button Bar Показать панель редактирования - + Show/Hide Editor Button Bar - + Hide Left Side Panels Скрыть панели слева - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left Влево - + Left Align Выровнять влево - + Right Вправо - + Right Align Выровнять вправо - + Center По центру - + Center Align Выровнять по центру - + Bold Полужирный - + Italic Курсив - + Underline Подчёркнутый - + Superscript Верхний индекс - + Subscript Нижний индекс - + Strikethrough Зачёркнутый - + Horizontal Line Вставить горизонтальную линию - + Bulleted List Маркированный список - + Numbered List Нумерованный список - + Numbered list Нумерованный список - + >> Increase >> Увеличить - + << Decrease << Уменьшить - - - + + + Edit Свойства - + Share With The World - + Share With Individuals - + Open/Close Notebooks Открыть/закрыть блокноты - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect Соединиться - + Synchronize with Evernote Синхронизация - + Note History История заметки - + Selective Synchronize - + Account Information Об аккаунте - + Database Status Состояние базы данных - + Show current database information Показать текущую информацию о базе данных - + Disable Note Indexing Отключить индексацию заметок - + Manually Stop Note Indexing - + Automatic Folder Importing Импорт папок - + Import Files Automatically - + Spell Check Проверка орфографии - + Check for spelling errors - + Encrypt Database Зашифровать базу данных - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4405,22 +4440,22 @@ Please place the cursor at the beginning & try again Протокол работы - + Release Notes Комментарии к релизам - + Release notes - + Check For Updates - + Check for newer versions @@ -4539,47 +4574,104 @@ Please place the cursor at the beginning & try again cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4822,224 +4914,224 @@ Please place the cursor at the beginning & try again cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote Синхронизация с Evernote - + User exception getting user account information. Aborting sync and disconnecting Ошибка при получении информации об аккаунте пользователя. Отмена синхронизации и выход из системы - + System error user account information. Aborting sync and disconnecting! Системная ошибка при получении информации об аккаунте пользователя. Отмена синхронизации и выход из системы! - + Transaction error getting user account information. Aborting sync and disconnecting! Ошибка транзакции при получении информации об аккаунте пользователя. Отмена синхронизации и выход из системы! - - - + + + Error getting sync state! Aborting sync and disconnecting! Ошибка при получении информации о состоянии синхронизации. Отмена синхронизации и выход из системы! - + Syncronization Error! Ошибка синхронизации! - + Cleaning up - + Synchronizing complete Синхронизация выполнена - + Download syncronization complete. Uploads have been disabled. Загрузка синхронизируемых файлов завершена. Выгрузка файлов была отключена. - + Synchronizing deleted notes. Синхронизация удалённых заметок. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: Ошибка: - - - - + + + + Error sending local note: Ошибка при отправлении локальных заметок: - - + + Sending local notes. Отправление локальных заметок. - + Sending local notebooks. Отправление локальных блокнотов. - + Sending local tags. Отправление локальных меток. - + Sending saved searches. Отправление сохранённых запросов. - + Downloading 0% complete. Загрузка 0%. - + Downloading Загрузка - + % complete. %. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_sk.ts b/translations/neighbornote_sk.ts index ae5c7ca..9815c7d 100644 --- a/translations/neighbornote_sk.ts +++ b/translations/neighbornote_sk.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. - + Performing synchronization before closing. @@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not - - + + - - - - - + + + + + + Confirmation - + Are you sure Are you sure you wish to decrypt the database? - + Decryption Complete - + Decryption is complete - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -78,7 +79,7 @@ Do you wish to proceed? - + Incorrect Password @@ -93,71 +94,71 @@ Do you wish to proceed? - + Release Notes - + Tool Bar - - + + Connect - - + + Connect to Evernote - + Disconnect - + Disconnect from Evernote - + Database will be reindexed. - + Notes will be reindexed. - + Note will be reindexed. - + Error Saving Note - + Note has never been synchronized. - - - + + + Error - + Unable to connect to the database. The most probable reason is that some other process @@ -169,58 +170,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit - + Add Note - + Are you sure - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -276,183 +277,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print - - + + Tag - + Attributes - - + + Email - - + + Delete - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -462,57 +468,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. - + Getting Note History - + Note not found on server. - + This note could not be found on Evernote's servers. - + History retrieved - + Restoring as new note. - + Note has been restored as a new note. - + Restoring note. - + Note has been restored. - + DOUGH!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -531,135 +537,141 @@ Who knows, you might get lucky. - + Finalizing Synchronization - + Synchronization Complete - + Synchronization completed with errors. Please check the log for details. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? - + Indexing is now enabled. - + Indexing is now disabled. - - + + Backup Database - + Backing up database - + Database backup completed. - + 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 @@ -669,52 +681,52 @@ Are you sure you want to continue? - + Restore Database - + Restoring database - + Database has been restored. - + Exporting Notes - + Export completed. - + Import Notes - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. @@ -1039,52 +1051,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel - + OK - + Settings - + Appearance - + Fonts - + Indexing - + Spell Check - + Connection - + Debugging - + Renso Note List @@ -1150,16 +1162,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval @@ -1169,76 +1171,76 @@ Are you sure you want to continue? Seconds between looking for unindexed notes - - - Word Parse - - - - - Regular Expression - - cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1565,57 +1567,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status - + Notebooks: - + Tags: - + Total Notes: - + Unsynchronized Notes: - + Unindexed Notes: - + Attachments/Images: - + Unindexed Attachments/Images: - + Saved Searches: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK @@ -2616,15 +2628,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -2984,43 +3011,43 @@ If you don't wish to use Evernote's then please check the option at th - + Font Color - + Font Hilight Color - + Source URL: - + Source URL: - - + + http:// - + Author: - + Unable Open - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3028,97 +3055,97 @@ and I'm too lazy to figure them out by myself. - + Error - + Error Encrypting String - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found - + A file attachment may not exceed 25MB. - + Attachment Size - - + + Save File - + Insert Hyperlink - + Edit Hyperlink - - + + Spell Check Error - + Spell Check Complete @@ -3689,506 +3716,506 @@ and I'm too lazy to figure them out by myself. - + Merge Notes - + Merge Multiple notes - + Export Selected Notes - + Export selected notes - + Copy as URL - + Import Notes - + Import notes - - - - + + + + Add - + Add a new note - + Modify Tags - + Change the tags assigned to this note - - - - + + + + Delete - + Delete this note - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note - + Find a string in the current note - + Undo - + Redo - + Cut - + Copy - + Paste - + Paste Without Formatting - + Show Note List - + Show/Hide Note List - + Show Tags - + Show/Hide Tags - + Show Notebooks - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview - + Preview Notes - + Show Saved Searches - + Show/Hide Saved Searches - + Show Attribute Searches - + Show/Hide Attribute Searches - + Show Trash - + Show/Hide Trash Tree - + Show Editor Button Bar - + Show/Hide Editor Button Bar - + Hide Left Side Panels - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left - + Left Align - + Right - + Right Align - + Center - + Center Align - + Bold - + Italic - + Underline - + Superscript - + Subscript - + Strikethrough - + Horizontal Line - + Bulleted List - + Numbered List - + Numbered list - + >> Increase - + << Decrease - - - + + + Edit - + Share With The World - + Share With Individuals - + Open/Close Notebooks - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect - + Synchronize with Evernote - + Note History - + Selective Synchronize - + Account Information - + Database Status - + Show current database information - + Disable Note Indexing - + Manually Stop Note Indexing - + Automatic Folder Importing - + Import Files Automatically - + Spell Check - + Check for spelling errors - + Encrypt Database - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4208,22 +4235,22 @@ and I'm too lazy to figure them out by myself. - + Release Notes - + Release notes - + Check For Updates - + Check for newer versions @@ -4334,47 +4361,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4613,224 +4697,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! - + Cleaning up - + Synchronizing complete - + Download syncronization complete. Uploads have been disabled. - + Synchronizing deleted notes. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. - + Downloading - + % complete. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_zh_CN.ts b/translations/neighbornote_zh_CN.ts index 40e4e79..e681426 100644 --- a/translations/neighbornote_zh_CN.ts +++ b/translations/neighbornote_zh_CN.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. - + Performing synchronization before closing. @@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not - - + + - - - - - + + + + + + Confirmation - + Are you sure Are you sure you wish to decrypt the database? - + Decryption Complete - + Decryption is complete - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -78,7 +79,7 @@ Do you wish to proceed? - + Incorrect Password @@ -93,71 +94,71 @@ Do you wish to proceed? - + Release Notes - + Tool Bar - - + + Connect - - + + Connect to Evernote - + Disconnect - + Disconnect from Evernote - + Database will be reindexed. - + Notes will be reindexed. - + Note will be reindexed. - + Error Saving Note - + Note has never been synchronized. - - - + + + Error - + Unable to connect to the database. The most probable reason is that some other process @@ -169,58 +170,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit - + Add Note - + Are you sure - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -276,183 +277,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print - - + + Tag - + Attributes - - + + Email - - + + Delete - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -462,57 +468,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. - + Getting Note History - + Note not found on server. - + This note could not be found on Evernote's servers. - + History retrieved - + Restoring as new note. - + Note has been restored as a new note. - + Restoring note. - + Note has been restored. - + DOUGH!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -531,135 +537,141 @@ Who knows, you might get lucky. - + Finalizing Synchronization - + Synchronization Complete - + Synchronization completed with errors. Please check the log for details. - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? - + Indexing is now enabled. - + Indexing is now disabled. - - + + Backup Database - + Backing up database - + Database backup completed. - + 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 @@ -669,52 +681,52 @@ Are you sure you want to continue? - + Restore Database - + Restoring database - + Database has been restored. - + Exporting Notes - + Export completed. - + Import Notes - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. @@ -1039,52 +1051,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel - + OK - + Settings - + Appearance - + Fonts - + Indexing - + Spell Check - + Connection - + Debugging - + Renso Note List @@ -1150,16 +1162,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval @@ -1169,76 +1171,76 @@ Are you sure you want to continue? Seconds between looking for unindexed notes - - - Word Parse - - - - - Regular Expression - - cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1565,57 +1567,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status - + Notebooks: - + Tags: - + Total Notes: - + Unsynchronized Notes: - + Unindexed Notes: - + Attachments/Images: - + Unindexed Attachments/Images: - + Saved Searches: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK @@ -2616,15 +2628,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -2984,43 +3011,43 @@ If you don't wish to use Evernote's then please check the option at th - + Font Color - + Font Hilight Color - + Source URL: - + Source URL: - - + + http:// - + Author: - + Unable Open - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3028,97 +3055,97 @@ and I'm too lazy to figure them out by myself. - + Error - + Error Encrypting String - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found - + A file attachment may not exceed 25MB. - + Attachment Size - - + + Save File - + Insert Hyperlink - + Edit Hyperlink - - + + Spell Check Error - + Spell Check Complete @@ -3689,506 +3716,506 @@ and I'm too lazy to figure them out by myself. - + Merge Notes - + Merge Multiple notes - + Export Selected Notes - + Export selected notes - + Copy as URL - + Import Notes - + Import notes - - - - + + + + Add - + Add a new note - + Modify Tags - + Change the tags assigned to this note - - - - + + + + Delete - + Delete this note - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Find In Note - + Find a string in the current note - + Undo - + Redo - + Cut - + Copy - + Paste - + Paste Without Formatting - + Show Note List - + Show/Hide Note List - + Show Tags - + Show/Hide Tags - + Show Notebooks - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Wide List View - + Narrow List View - + Preview - + Preview Notes - + Show Saved Searches - + Show/Hide Saved Searches - + Show Attribute Searches - + Show/Hide Attribute Searches - + Show Trash - + Show/Hide Trash Tree - + Show Editor Button Bar - + Show/Hide Editor Button Bar - + Hide Left Side Panels - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left - + Left Align - + Right - + Right Align - + Center - + Center Align - + Bold - + Italic - + Underline - + Superscript - + Subscript - + Strikethrough - + Horizontal Line - + Bulleted List - + Numbered List - + Numbered list - + >> Increase - + << Decrease - - - + + + Edit - + Share With The World - + Share With Individuals - + Open/Close Notebooks - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect - + Synchronize with Evernote - + Note History - + Selective Synchronize - + Account Information - + Database Status - + Show current database information - + Disable Note Indexing - + Manually Stop Note Indexing - + Automatic Folder Importing - + Import Files Automatically - + Spell Check - + Check for spelling errors - + Encrypt Database - + Encrypt the database upon shutdown - + Logs - + Show the detailed application log @@ -4208,22 +4235,22 @@ and I'm too lazy to figure them out by myself. - + Release Notes - + Release notes - + Check For Updates - + Check for newer versions @@ -4334,47 +4361,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4613,224 +4697,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! - + Cleaning up - + Synchronizing complete - + Download syncronization complete. Uploads have been disabled. - + Synchronizing deleted notes. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. - + Downloading - + % complete. - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails. diff --git a/translations/neighbornote_zh_TW.ts b/translations/neighbornote_zh_TW.ts index 0ac3639..9205efe 100644 --- a/translations/neighbornote_zh_TW.ts +++ b/translations/neighbornote_zh_TW.ts @@ -4,12 +4,12 @@ cx.fbn.nevernote.NeverNote - + Beginning shutdown. 開始關機 - + Performing synchronization before closing. 關閉前執行資料同步 @@ -37,37 +37,38 @@ Please delete the notes or move them to another notebook before deleting any not 至少要有一份記事本 - - + + - - - - - + + + + + + Confirmation 確定 - + Are you sure Are you sure you wish to decrypt the database? 你確定要對資料庫進行解密嗎 - + Decryption Complete 解密完畢 - + Decryption is complete 解密完畢 - + Encrypting the database is usedto enhance security and is performed upon shutdown, but please be aware that if you lose the password your is lost forever. @@ -79,7 +80,7 @@ Do you wish to proceed? - + Incorrect Password @@ -94,7 +95,7 @@ Do you wish to proceed? 編輯搜尋 - + Release Notes 版本資訊 @@ -111,7 +112,7 @@ Do you wish to proceed? <h4><center><b>NeverNote</b></center></h4><hr><center>版本 - + Tool Bar 工具列 @@ -128,24 +129,24 @@ Do you wish to proceed? 搜尋: - - + + Connect 連線 - - + + Connect to Evernote 連線 Evernote - + Disconnect 斷線 - + Disconnect from Evernote 自 Evernote 斷線 @@ -154,17 +155,17 @@ Do you wish to proceed? 重建記事本索引 - + Database will be reindexed. 將重建資料庫索引 - + Notes will be reindexed. 將重建記事本索引 - + Note will be reindexed. 將重建記事本索引 @@ -173,24 +174,24 @@ Do you wish to proceed? 要刪除選擇的記事本嗎？ - + Error Saving Note 記事儲存錯誤 - + Note has never been synchronized. 記事尚未同步過 - - - + + + Error 錯誤 - + Unable to connect to the database. The most probable reason is that some other process @@ -202,58 +203,58 @@ Exiting program. - + Database Connection Error - - + + NeighborNote - + Renso Note List - + Show/Hide - + Exit 離開 - + Add Note - + Are you sure 你確定要對資料庫進行解密嗎 - + Are you sure you wish to encrypt the database? - + Encryption Complete - + Encryption is complete - + Database Decryption @@ -309,183 +310,188 @@ Exiting program. - + 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 NeighborNote will be unresponsive until it is complete. Do you wish to continue? - + About NeighborNote - + <h4><center><b>NeighborNote</b></center></h4><hr><center>Version - + <hr>Open Source Evernote Client.<br><br>Licensed under GPL v2. <br><hr><br></center>Evernote is copyright 2001-2012 by Evernote Corporation<br>Jambi and QT are the licensed trademark of Nokia Corporation<br>PDFRenderer is licened under the LGPL<br>JTidy is copyrighted under the World Wide Web Consortium<br>Apache Common Utilities licensed under the Apache License Version 2.0<br>Jazzy is licened under the LGPL<br>Java is a registered trademark of Oracle Corporation.<br><hr>Special thanks to:<br>BitRock InstallBuilder for the Windows installer<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering. - + Previous - + Next - + Up - + Down - - + + Synchronize - - + + Print 列印 - - + + Tag 標籤 - + Attributes 屬性 - - + + Email 傳送電子郵件 - - + + Delete 刪除 - + New - - + + All Notes - + Previous Arrow - + Next Arrow - + Up Arrow - + Down Arrow - + Attribute - + Add 新增 - + Search Clear - + Invalid authorization token received. - + + Are you sure you want to enable the auto-login feature? + + + + Note Not Found - + Sorry, but I can't seem to find that note. - + NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only. - + Delete - + Delete note " - + Delete note selected note? - + Permanently delete - + Permanently delete note " - + Permanently delete note selected note? - + An error has happened while saving the note " - + ". This is probably due to a document that is too complex for NeighborNote to process. As a result, changes to the note may not be saved properly in the database. @@ -495,57 +501,57 @@ be lost. Please review the note to recover any critical data before restarting. - + This note has never been sent to Evernote, so there is no history. 此記事並未送到 Evernote, 所以目前並無該記事的歷程紀錄 - + Getting Note History 取得記事歷程 - + Note not found on server. 在伺服器中找不到此記事 - + This note could not be found on Evernote's servers. - + History retrieved 取回歷程 - + Restoring as new note. 回存成新的記事 - + Note has been restored as a new note. 記事已經另存成新的記事 - + Restoring note. 回存記事 - + Note has been restored. 記事已經回存 - + DOUGH!!! 現金!!! - + Well, this is embarrassing. Some attachments or images for this note appear to be missing from my database. @@ -564,104 +570,110 @@ Who knows, you might get lucky. - + Finalizing Synchronization 定型同步 - + Synchronization Complete 完成同步 - + Synchronization completed with errors. Please check the log for details. 同步完成的錯誤 若要知道詳細情況請讀日誌紀錄 - + Indexing notes - + Index complete - - - - - - + + + + + + + A thread has died. - + It appears as the tag counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the notebook counter thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the note saver thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the synchronization thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - + It appears as the index thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. - - - + + It appears as the Evernote Related Notes thread has died. I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry. + + + + + + NixNote Export (*.nnex);;All Files (*.*) - + Import completed. - + Please Synchronize - + Please either synchronize or move any new notes to a local notebook. - + No Response from CodeCogs - + Unable to contact CodeCogs for LaTeX formula. - + Exclude note " - + Exclude note selected note? @@ -674,12 +686,12 @@ Who knows, you might get lucky. 記事索引中 - + Indexing is now enabled. 啟用索引 - + Indexing is now disabled. 關閉索引 @@ -688,8 +700,8 @@ Who knows, you might get lucky. 執行線程結束 - - + + Backup Database 備份資料 @@ -698,17 +710,17 @@ Who knows, you might get lucky. NeverNote 匯出成 (*.nnex);;所有檔案格式(*.*) - + Backing up database 備份資料中 - + Database backup completed. 資料庫備份完畢 - + 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 @@ -723,52 +735,52 @@ Are you sure you want to continue? - + Restore Database 回存資料庫 - + Restoring database 資料庫回存中 - + Database has been restored. 資料庫回存完畢 - + Exporting Notes 匯出記事 - + Export completed. 匯出完畢 - + Import Notes 匯入記事 - + NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*) - + Importing Notes - + Create new tags from import? - + Notes have been imported. 記事已匯入 @@ -1125,52 +1137,52 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.ConfigDialog - + Cancel 取消 - + OK 確定 - + Settings 設定 - + Appearance 外觀設定 - + Fonts - + Indexing 索引 - + Spell Check 拼字檢查 - + Connection 連線 - + Debugging 除錯 - + Renso Note List @@ -1244,16 +1256,6 @@ Are you sure you want to continue? - - Automatically Wildcard All Searches - - - - - Special Word Characters - - - Index Interval 索引間隔時間 @@ -1264,75 +1266,79 @@ Are you sure you want to continue? - - Word Parse - - - - Regular Expression - 正規表示式 + 正規表示式 cx.fbn.nevernote.dialog.ConfigRensoNoteListPage - - Browse Weight + + Concurrent Browse Weight - + Copy&Paste Weight - + Add New Note Weight - + Renso Item Click Weight - + Same Tag Weight - + Same Notebook Weight - + + Evernote Related Notes Weight + + + + Weighting - + + You can change these settings if you select "Custom" Mode. + + + + When you merge the notes, also merge RensoNoteList - + When you duplicate the notes, also duplicate RensoNoteList - + Verify when you exclude the note - + Renso Note List Item Maximum - + Others @@ -1659,57 +1665,67 @@ Are you sure you want to continue? cx.fbn.nevernote.dialog.DatabaseStatus - + Current Database Status 目前資料庫狀態 - + Notebooks: 記事本: - + Tags: 標籤: - + Total Notes: 標籤總數: - + Unsynchronized Notes: 未同步記事: - + Unindexed Notes: 未索引記事: - + Attachments/Images: 附件/影像: - + Unindexed Attachments/Images: - + Saved Searches: 儲存搜尋結果: - + Words In Index - + + Tobal Behavior History: + + + + + Renso Note Click: + + + + OK 確定 @@ -2737,15 +2753,30 @@ If you don't wish to use Evernote's then please check the option at th cx.fbn.nevernote.dialog.UpgradeAvailableDialog - + Upgrade Available - + Automatically check for updates at startup + + + Do you want to download now? + + + + + Yes + + + + + No + + cx.fbn.nevernote.dialog.WatchFolder @@ -3105,43 +3136,43 @@ If you don't wish to use Evernote's then please check the option at th 待辦事項 - + Font Color 字型顏色 - + Font Hilight Color 凸顯文字顏色 - + Source URL: 來源網址 - + Source URL: 來源網址: - - + + http:// http:// - + Author: 作者: - + Unable Open 無法開啟 - + This is an ink note. Ink notes are not supported since Evernote has not published any specifications on them @@ -3149,60 +3180,60 @@ and I'm too lazy to figure them out by myself. - + Error 錯誤 - + Error Encrypting String 字串加密錯誤 - + No Matches Found - + No matching notes found. - + Incorrect Password - + The password entered is not correct - - - + + + Untitled Note 未命名記事 - - + + Dictionary - + .dic was not found. - + .dic is invalid. - + No Errors Found @@ -3215,39 +3246,39 @@ and I'm too lazy to figure them out by myself. 免費用戶 - + A file attachment may not exceed 25MB. 附檔不可超過 25 MB. - + Attachment Size 附檔大小 - - + + Save File 存檔 - + Insert Hyperlink 加入超連結 - + Edit Hyperlink 編輯超連結 - - + + Spell Check Error 拼字檢查發現錯誤 - + Spell Check Complete 完成拼字檢查 @@ -3772,140 +3803,140 @@ and I'm too lazy to figure them out by myself. 複製此記事 - + Merge Notes 合併記事 - + Merge Multiple notes 合併多項記事 - + Export Selected Notes 匯出選擇的記事 - + Export selected notes 將選擇的記事匯出 - + Import Notes 匯入記事 - + Import notes 匯入記事 - - - - + + + + Add 新增 - + Add a new note 新增記事 - + Modify Tags 修改標籤 - + Change the tags assigned to this note 將變動的標籤套用至此記事 - - - - + + + + Delete 刪除 - + Delete this note 刪除此記事 - + Find In Note 在記事中搜尋 - + Find a string in the current note 在記事中尋找 - + Undo 復原 - + Redo 重做 - + Cut 剪下 - + Copy 複製 - + Paste 貼上 - + Paste Without Formatting 貼為文字(不含格式) - + Show Note List 顯示記事列表 - + Show Tags 顯示標籤 - + Show Notebooks 顯示記事本 - + Preview 預視 - + Wide List View 清單檢視 @@ -3960,388 +3991,388 @@ and I'm too lazy to figure them out by myself. - + Copy as URL - + Open in New Tab - + Open this note in new tab - + Add in New Tab - + Add a new note in new tab - + Show/Hide Note List - + Show/Hide Tags - + Show/Hide Notebooks - + Show Zoom - + Show/Hide Zoom - + Show Quota Bar - + Show/Hide Quota - + Show Search Box - + Show/Hide Search Box - + Narrow List View 混合檢視 - + Preview Notes - + Show Saved Searches 顯示搜尋結果 - + Show/Hide Saved Searches - + Show Attribute Searches 顯示搜尋屬性 - + Show/Hide Attribute Searches - + Show Trash 顯示資源回收筒 - + Show/Hide Trash Tree - + Show Editor Button Bar 顯示編輯圖示列 - + Show/Hide Editor Button Bar - + Hide Left Side Panels 隱藏左方面板 - + Hide The Entire Left Side - + View Source - + View the source HTML for a note - + Left 靠左 - + Left Align 向左對齊 - + Right 靠右 - + Right Align 向右對齊 - + Center 置中 - + Center Align 置中對齊 - + Bold 粗體 - + Italic 斜體 - + Underline 底線 - + Superscript 上標 - + Subscript 下標 - + Strikethrough 刪除線 - + Horizontal Line 水平線 - + Bulleted List 項目符號清單 - + Numbered List 編號清單 - + Numbered list 編號清單 - + >> Increase >> 增加縮排 - + << Decrease >> 減少縮排 - - - + + + Edit 編輯 - + Share With The World - + Share With Individuals - + Open/Close Notebooks 開啟/關閉 記事本 - - - + + + Change Icon - + Set Stack - + Merge Tags - + Connect 連線 - + Synchronize with Evernote 同步至 Evernote - + Note History 記事歷程紀錄 - + Selective Synchronize 選擇同步設定 - + Account Information 帳號資料 - + Database Status 資料庫狀態 - + Show current database information 顯示目前資料庫資訊 - + Disable Note Indexing 關閉記事索引 - + Manually Stop Note Indexing - + Automatic Folder Importing 自動匯入資料夾 - + Import Files Automatically - + Spell Check 拼字檢查 - + Check for spelling errors - + Encrypt Database 資料庫加密 - + Encrypt the database upon shutdown - + Logs 日誌紀錄 - + Show the detailed application log - + Release Notes 版本資訊 - + Release notes - + Check For Updates 檢查有無更新 - + Check for newer versions @@ -4475,47 +4506,104 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.gui.RensoNoteList - + Open in New Tab - + Open this note in new tab - - STAR + + Add Star - - Star this item + + Add Star to this item - - UNSTAR + + Remove Star - - Unstar this item + + Remove Star from this item - + Exclude - + Exclude this note from RensoNoteList + cx.fbn.nevernote.gui.RensoNoteListDock + + + Mode: + + + + + + Preset Weighting Mode + + + + + Standard + + + + + Concurrent Browse + + + + + Content Similarity + + + + + Custom + + + + + Halt Collectiong Operation Log + + + + + + Information + + + + + Custom mode was selected. +You can customize weighting manually in the Edit/Preferences/Renso Note List. + + + + + Collecting operation log halted. +You can resume, if you press this button again. + + + + cx.fbn.nevernote.gui.SavedSearchTreeWidget @@ -4758,224 +4846,224 @@ and I'm too lazy to figure them out by myself. cx.fbn.nevernote.threads.SyncRunner - + Error synchronizing - see log for details. - + Synchronizing with Evernote 同步至 Evernote - + User exception getting user account information. Aborting sync and disconnecting - + System error user account information. Aborting sync and disconnecting! - + Transaction error getting user account information. Aborting sync and disconnecting! - - - + + + Error getting sync state! Aborting sync and disconnecting! - + Syncronization Error! 同步錯誤！ - + Cleaning up - + Synchronizing complete 完成同步 - + Download syncronization complete. Uploads have been disabled. 完成下載同步，已關閉上傳。 - + Synchronizing deleted notes. 同步刪除記事 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error: 錯誤: - - - - + + + + Error sending local note: - - + + Sending local notes. - + Sending local notebooks. - + Sending local tags. - + Sending saved searches. - + Downloading 0% complete. 完成下載 0% - + Downloading 下載中 - + % complete. %已完成 - + Connection Error - + Error retrieving user information. Synchronization not complete - + User exception Listing shared notebooks. - + System exception Listing shared notebooks. - + Transaction exception Listing shared notebooks. - + EDAM Not Found exception Listing shared notebooks. - + User exception Listing notebooks. - + System exception Listing notebooks. - + Transaction exception Listing notebooks. - + User exception Listing linked notebooks. - + System exception Listing linked notebooks. - + Transaction exception Listing lineked notebooks. - + EDAM Not Found exception Listing linked notebooks. - + Synchronizing shared notebooks. - + EDAM UserException synchronizing linked notbook. See the log for datails. - + EDAM UserException synchronizing linked notbook - + EDAM SystemException synchronizing linked notbook. See the log for datails. - + EDAM SystemException synchronizing linked notbook. See the log for datails - + Notebook URL not found. Removing notobook - - + + EDAM TException synchronizing linked notbook. See the log for datails.