Import version 0.11

chrome.manifest

@@ -1,6 +1,8 @@
 content	quickmove	        chrome/content/
 locale  quickmove en-US     chrome/locales/en-US/
 locale  quickmove de        chrome/locales/de/
+locale  quickmove uk        chrome/locales/uk/
+locale  quickmove ru        chrome/locales/ru/
 resource quickmove          .
 
 overlay chrome://messenger/content/messenger.xul chrome://quickmove/content/quickmove-overlay.xul

chrome/content/quickmove-overlay.xul

@@ -2,7 +2,9 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   - Portions Copyright (C) Philipp Kewisch, 2009-2012 -->
+   - Portions Copyright (C) Philipp Kewisch, 2009-2014 -->
+
+<!DOCTYPE overlay SYSTEM "chrome://quickmove/locale/quickmove.dtd">
 
 <overlay id="quickmove-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -122,7 +124,7 @@
   <menupopup id="button-filePopup" hidden="true" removeelement="true"/>
 
   <keyset id="mailKeys">
-    <key id="quickmove-file" key="m" modifiers="shift" oncommand="quickmove.openFile()"/>
-    <key id="quickmove-goto" key="g" modifiers="shift" oncommand="quickmove.openGoto()"/>
+    <key id="quickmove-file" key="&quickmove.keyboard.file.key;" modifiers="&quickmove.keyboard.file.modifiers;" oncommand="quickmove.openFile()"/>
+    <key id="quickmove-goto" key="&quickmove.keyboard.goto.key;" modifiers="&quickmove.keyboard.goto.modifiers;" oncommand="quickmove.openGoto()"/>
   </keyset>
 </overlay>

chrome/content/quickmove-prefs.xul

@@ -1,39 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Quickmove Extension code.
-   -
-   - The Initial Developer of the Original Code is
-   -   Philipp Kewisch <[email protected]>
-   - Portions created by the Initial Developer are Copyright (C) 2010
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   - Portions Copyright (C) Philipp Kewisch, 2010-2014 -->
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 

chrome/locales/de/quickmove.dtd

@@ -1,39 +1,12 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Quickmove Extension code.
-   -
-   - The Initial Developer of the Original Code is
-   -   Philipp Kewisch <[email protected]>
-   - Portions created by the Initial Developer are Copyright (C) 2010
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   - Portions Copyright (C) Philipp Kewisch, 2010 -->
 
 <!ENTITY quickmove.options.title                           "Optionen für Schnelles Nachrichtenverschieben">
 <!ENTITY quickmove.options.maxRecentFolders.label          "Anzahl zuletzt verwendeter Ordner">
 <!ENTITY quickmove.options.maxRecentFolders.tooltip        "Ändert die Anzahl der zuletzt verwendeten Ordner, die angezeigt werden wenn kein Suchtext eingegeben wurde.">
+<!ENTITY quickmove.keyboard.file.key                       "m">
+<!ENTITY quickmove.keyboard.file.modifiers                 "shift">
+<!ENTITY quickmove.keyboard.goto.key                       "g">
+<!ENTITY quickmove.keyboard.goto.modifiers                 "shift">

chrome/locales/de/quickmove.properties

@@ -1,37 +1,6 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Calendar code.
-#
-# The Initial Developer of the Original Code is
-#   Philipp Kewisch <[email protected]>
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Portions Copyright (C) Philipp Kewisch, 2009
 
 noResults=<Keine Ergebnisse>

chrome/locales/en-US/amo.properties

@@ -0,0 +1,18 @@
+[name]
+Quick Folder Move
+
+[shortdesc]
+When filing messages, you can use the keyboard shortcuts to quickly search for the folder to move the message to. The long description has info on how to use the extension. If no search term is entered, a list of recent folders will show up instead.
+
+[longdesc]
+Use the keyboard to quickly move messages and navigate folders. First of all, use one of the following keyboard shortcuts:
+<ul>
+  <li><b>Shift+M</b> opens a context menu that allows you to move the currently selected messages</li>
+  <li><b>Shift+G</b> opens a context menu that allows you to navigate to the folder you've entered</li>
+</ul>
+Then enter parts of the folder you want to move the message to. Pressing Enter will move the message to the first entry in the search results. If you'd rather use the context menus, the Move To/Copty To context menus have also been modified to use the quick folder move menu.
+
+<b>KNOWN ISSUES</b>
+Unfortunately using the keyboard to navigate between the menu items in the dropdown is hindered by bugs in the Mozilla Platform. I have a workaround in progress, please stay tuned. Until then, you will have to enter a more unique portion of your folder name.
+
+Using Shift+G to open a folder not shown in the view uses a Thunderbird native function to select the folder. This function changes to the default view (all folders) if the folder is not visible (i.e contains no unread messages).

chrome/locales/en-US/quickmove.dtd

@@ -1,39 +1,12 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Quickmove Extension code.
-   -
-   - The Initial Developer of the Original Code is
-   -   Philipp Kewisch <[email protected]>
-   - Portions created by the Initial Developer are Copyright (C) 2010
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   - Portions Copyright (C) Philipp Kewisch, 2010 -->
 
 <!ENTITY quickmove.options.title                           "Quick Folder Move Options">
 <!ENTITY quickmove.options.maxRecentFolders.label          "Number of Recent Folders:">
 <!ENTITY quickmove.options.maxRecentFolders.tooltip        "Changes the number of recent folders shown when no search text is entered">
+<!ENTITY quickmove.keyboard.file.key                       "m">
+<!ENTITY quickmove.keyboard.file.modifiers                 "shift">
+<!ENTITY quickmove.keyboard.goto.key                       "g">
+<!ENTITY quickmove.keyboard.goto.modifiers                 "shift">

chrome/locales/en-US/quickmove.properties

@@ -1,37 +1,6 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Calendar code.
-#
-# The Initial Developer of the Original Code is
-#   Philipp Kewisch <[email protected]>
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Portions Copyright (C) Philipp Kewisch, 2009
 
 noResults=<No Results>

chrome/locales/ru/quickmove.dtd

@@ -0,0 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY quickmove.options.title                           "Quick Folder Move Настройки">
+<!ENTITY quickmove.options.maxRecentFolders.label          "Количество последних папок:">
+<!ENTITY quickmove.options.maxRecentFolders.tooltip        "Изменяет количество последних папок, что отображаются, если не введен текст в поле поиска">
+<!ENTITY quickmove.keyboard.file.key                       "п">
+<!ENTITY quickmove.keyboard.file.modifiers                 "shift">
+<!ENTITY quickmove.keyboard.goto.key                       "и">
+<!ENTITY quickmove.keyboard.goto.modifiers                 "shift">

chrome/locales/ru/quickmove.properties

@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+noResults=<Результаты отсутствуют>

chrome/locales/uk/quickmove.dtd

@@ -0,0 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY quickmove.options.title                           "Quick Folder Move Налаштування">
+<!ENTITY quickmove.options.maxRecentFolders.label          "Кількість останніх папок:">
+<!ENTITY quickmove.options.maxRecentFolders.tooltip        "Змінює кількість останніх папок, що відображуються, коли не ввдено жодного тексту в поле пошуку">
+<!ENTITY quickmove.keyboard.file.key                       "п">
+<!ENTITY quickmove.keyboard.file.modifiers                 "shift">
+<!ENTITY quickmove.keyboard.goto.key                       "і">
+<!ENTITY quickmove.keyboard.goto.modifiers                 "shift">

chrome/locales/uk/quickmove.properties

@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+noResults=<Результати відсутні>

defaults/preferences/quickmove.js

@@ -1,38 +1,7 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Quickmove Extension code.
- *
- * The Initial Developer of the Original Code is
- *   Philipp Kewisch <[email protected]>
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch, 2010 */
 
 // The maximum number of recent folder entries.
 pref("extensions.quickmove.maxRecentFolders", 15);