diff -Nru catfish-0.6.3/ChangeLog catfish-0.8.2/ChangeLog
--- catfish-0.6.3/ChangeLog 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/ChangeLog 2013-09-21 00:21:01.000000000 +0000
@@ -1,3 +1,22 @@
+v0.8.2:
+ + Fix PyGObject deprecation warning (lp: #1228440)
+
+v0.8.1:
+ + Fix python2/3 error that prevented installation (lp 1217507)
+
+v0.8.0:
+ + Add Folder filter
+ + Improved encoding support
+ + Improved Python3 support
+ + Remember sidebar visibility and hidden files toggled (lp 1188954)
+ + Enhanced image thumbnailer (lp 1193311)
+ + Use pexpect and SudoDialog to replace gksu dependency (lp 1202085)
+
+v0.6.4:
+ + Make singular files found message available.
+ + Make Search terms placeholder text translateable (lp 1175201)
+ + Make commandline options translateable (lp 1175204)
+
v0.6.3:
+ Fix crash when directory in PATH does not exist (lp 1166079)
+ Fix case sensitivity in search backend (lp 1166214)
diff -Nru catfish-0.6.3/Makefile.in.in catfish-0.8.2/Makefile.in.in
--- catfish-0.6.3/Makefile.in.in 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/Makefile.in.in 2013-09-21 00:21:01.000000000 +0000
@@ -33,10 +33,23 @@
install catfish_lib/AboutDialog.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib
install catfish_lib/Builder.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib
install catfish_lib/catfishconfig.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib
+ install catfish_lib/CatfishSettings.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib
install catfish_lib/helpers.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib
install catfish_lib/__init__.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib
+ install catfish_lib/SudoDialog.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib
install catfish_lib/Window.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib
+ install -d $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+ install catfish_lib/pexpect/ANSI.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+ install catfish_lib/pexpect/fdpexpect.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+ install catfish_lib/pexpect/FSM.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+ install catfish_lib/pexpect/__init__.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+ install catfish_lib/pexpect/LICENSE $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+ install catfish_lib/pexpect/psh.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+ install catfish_lib/pexpect/pxssh.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+ install catfish_lib/pexpect/README $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+ install catfish_lib/pexpect/screen.py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/catfish_lib/pexpect
+
install -d $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/data
install -d $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/data/ui
install data/ui/AboutCatfishDialog.ui $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/data/ui
diff -Nru catfish-0.6.3/bin/catfish.py catfish-0.8.2/bin/catfish.py
--- catfish-0.6.3/bin/catfish.py 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/bin/catfish.py 2013-09-21 00:21:01.000000000 +0000
@@ -46,6 +46,8 @@
if python_path:
os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
-GObject.threads_init()
+if GObject.pygobject_version < (3,9,1):
+ GObject.threads_init()
+
import catfish
catfish.main()
diff -Nru catfish-0.6.3/catfish/CatfishSearchEngine.py catfish-0.8.2/catfish/CatfishSearchEngine.py
--- catfish-0.6.3/catfish/CatfishSearchEngine.py 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/catfish/CatfishSearchEngine.py 2013-09-21 00:21:01.000000000 +0000
@@ -120,6 +120,7 @@
file_count = 0
for method in self.methods:
+ logger.debug (method.method_name)
for filename in method.run(keywords, path, regex):
if isinstance(filename, str) and path in filename:
if method.method_name == 'fulltext' or \
diff -Nru catfish-0.6.3/catfish/CatfishWindow.py catfish-0.8.2/catfish/CatfishWindow.py
--- catfish-0.6.3/catfish/CatfishWindow.py 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/catfish/CatfishWindow.py 2013-09-21 00:21:01.000000000 +0000
@@ -34,19 +34,19 @@
import logging
logger = logging.getLogger('catfish')
-from catfish_lib import Window
+from catfish_lib import Window, CatfishSettings, SudoDialog, pexpect
from catfish.AboutCatfishDialog import AboutCatfishDialog
from catfish.CatfishSearchEngine import *
-from sys import version_info
-python3 = version_info[0] > 2
+import sys
+pyversion = float(str(sys.version_info[0]) + '.' + str(sys.version_info[1]))
# Initialize Gtk, GObject, and mimetypes
-GObject.threads_init()
-GLib.threads_init()
+if GObject.pygobject_version < (3,9,1):
+ GObject.threads_init()
+ GLib.threads_init()
mimetypes.init()
-
def application_in_PATH(application_name):
"""Return True if the application name is found in PATH."""
for path in os.getenv('PATH').split(':'):
@@ -63,6 +63,20 @@
return True
splitpath = os.path.split(splitpath[0])
return False
+
+def surrogate_escape(text, replace=False):
+ """Replace non-UTF8 characters with something displayable.
+ If replace is True, display (invalid encoding) after the text."""
+ try:
+ text.encode('utf-8')
+ except UnicodeEncodeError:
+ text = text.encode('utf-8', errors='surrogateescape').decode('utf-8', errors='replace')
+ if replace:
+ # Translators: this text is displayed next to a filename that is not utf-8 encoded.
+ text = _("%s (invalid encoding)") % text
+ except UnicodeDecodeError:
+ text = text.decode('utf-8', errors='replace')
+ return text
# See catfish_lib.Window.py for more details about how this class works
class CatfishWindow(Window):
@@ -74,9 +88,10 @@
start_date = datetime.datetime.now()
end_date = datetime.datetime.now()
- filter_formats = { 'documents': False, 'images': False, 'music': False,
- 'videos': False, 'applications': False, 'other': False,
- 'exact': False, 'hidden': False, 'fulltext': False }
+ filter_formats = { 'documents': False, 'folders': False, 'images': False,
+ 'music': False, 'videos': False, 'applications': False,
+ 'other': False, 'exact': False, 'hidden': False,
+ 'fulltext': False }
filter_custom_mimetype = { 'category_text': "", 'category_id': -1,
'type_text': "", 'type_id': -1 }
@@ -158,6 +173,8 @@
self.sidebar.get_style_context().connect("changed",
self.reload_symbolic_icons,
builder)
+
+ self.settings = CatfishSettings.CatfishSettings()
def reload_symbolic_icons(self, widget, builder):
"""Reload the symbolic icons on GTK or icon theme change."""
@@ -212,8 +229,9 @@
# Set search defaults.
self.exact_match.set_active( self.options.exact )
- self.hidden_files.set_active( self.options.hidden )
+ self.hidden_files.set_active( self.options.hidden or self.settings.get_setting('show-hidden-files') )
self.fulltext.set_active( self.options.fulltext )
+ self.sidebar_toggle_menu.set_active( self.settings.get_setting('show-sidebar') )
# Set the interface to standard or preview mode.
if self.options.icons_large or self.options.thumbnails:
@@ -269,9 +287,27 @@
"""Unlock admin rights and perform 'updatedb' query."""
self.update_index_active = True
+ # Get the password for sudo
+ sudo_dialog = SudoDialog.SudoDialog(icon='catfish', name=_("Catfish File Search"), retries=3)
+ sudo_dialog.run()
+ sudo_dialog.hide()
+ password = sudo_dialog.get_password()
+
+ if not password:
+ self.update_index_active = False
+ self.update_index_done.set_label(_("Authentication failed."))
+ self.update_index_done.show()
+ return False
+
+ self.update_index_done.hide()
+
# Subprocess to check if query has completed yet, runs at end of func.
def updatedb_subprocess():
- done = self.updatedb_process.poll() != None
+ try:
+ self.updatedb_process.expect(pexpect.EOF)
+ done = True
+ except pexpect.TIMEOUT:
+ done = False
if done:
self.update_index_active = False
self.update_index_close.set_label(Gtk.STOCK_CLOSE)
@@ -280,7 +316,7 @@
self.update_index_close.set_sensitive(True)
self.update_index_unlock.hide()
self.update_index_unlock.set_sensitive(True)
- return_code = self.updatedb_process.returncode
+ return_code = self.updatedb_process.exitstatus
if return_code == 0:
status = _('Locate database updated successfully.')
elif return_code == 1:
@@ -290,7 +326,7 @@
elif return_code == 3:
status = _("Authentication failed.")
else:
- status = _("User aborted authentication.")
+ status = _('Locate database updated successfully.')
self.update_index_done.set_label(status)
self.update_index_done.show()
return not done
@@ -300,26 +336,21 @@
self.update_index_updating.show()
self.update_index_close.set_sensitive(False)
self.update_index_unlock.set_sensitive(False)
-
- # Start the query. Use catfish.desktop to make popup safer-looking.
- command = ['gksudo', 'updatedb']
-
- # Check for installed catfish.desktop file to make popup safer-looking.
- for path in [os.path.expanduser('~/.local/share/applications'),
- '/usr/local/share/applications',
- '/usr/share/applications']:
- desktop_file = os.path.join(path, 'catfish.desktop')
- if os.path.isfile( desktop_file ):
- command += ['--desktop', desktop_file]
- break
-
- self.updatedb_process = subprocess.Popen(command,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- shell=False)
-
- # Poll every 1 second for completion.
- GLib.timeout_add(1000, updatedb_subprocess)
+
+ self.updatedb_process = pexpect.spawn('sudo updatedb')
+ self.updatedb_process.timeout = 1
+ try:
+ # Check for password prompt or program exit.
+ self.updatedb_process.expect(".*ssword.*")
+ self.updatedb_process.sendline(password)
+ self.updatedb_process.expect(pexpect.EOF)
+ except pexpect.EOF:
+ # shell already has password, or its not needed
+ pass
+ except pexpect.TIMEOUT:
+ # Poll every 1 second for completion.
+ pass
+ GLib.timeout_add(1000, updatedb_subprocess)
# -- Search Entry -- #
def on_search_entry_activate(self, widget):
@@ -400,7 +431,9 @@
def on_menu_hidden_files_toggled(self, widget):
"""Toggle the hidden files settings."""
- self.filter_format_toggled("hidden", widget.get_active())
+ active = widget.get_active()
+ self.filter_format_toggled("hidden", active)
+ self.settings.set_setting('show-hidden-files', active)
def on_menu_fulltext_toggled(self, widget):
"""Toggle the fulltext settings, and restart the search."""
@@ -416,6 +449,7 @@
def on_sidebar_toggle_toggled(self, widget):
"""Toggle visibility of the sidebar."""
active = widget.get_active()
+ self.settings.set_setting('show-sidebar', active)
if active != self.sidebar.get_visible():
self.sidebar.set_visible(active)
@@ -520,6 +554,9 @@
def on_documents_toggled(self, widget):
self.filter_format_toggled("documents", widget.get_active())
+ def on_folders_toggled(self, widget):
+ self.filter_format_toggled("folders", widget.get_active())
+
def on_images_toggled(self, widget):
self.filter_format_toggled("images", widget.get_active())
@@ -647,6 +684,7 @@
def open_file(self, filename):
"""Open the specified filename in its default application."""
+ logger.debug("Opening %s" % filename)
command = None
if os.path.isdir(filename):
if self.options.fileman:
@@ -684,6 +722,7 @@
def on_menu_filemanager_activate(self, widget):
"""Open the selected file in the default file manager."""
+ logger.debug("Opening file manager for %i path(s)" % len(self.selected_filenames))
dirs = []
for filename in self.selected_filenames:
path = os.path.split(filename)[0]
@@ -694,14 +733,18 @@
def on_menu_copy_location_activate(self, widget):
"""Copy the selected file name to the clipboard."""
+ logger.debug("Copying %i filename(s) to the clipboard" % len(self.selected_filenames))
clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD)
- text = str(os.linesep).join(self.selected_filenames)
+ locations = []
+ for filename in self.selected_filenames:
+ locations.append( surrogate_escape(filename) )
+ text = str(os.linesep).join(locations)
clipboard.set_text(text, -1)
clipboard.store()
def on_menu_save_activate(self, widget):
"""Show a save dialog and possibly write the results to a file."""
- filename = self.get_save_dialog(self.selected_filenames[0])
+ filename = self.get_save_dialog(surrogate_escape(self.selected_filenames[0]))
if filename:
try:
# Try to save the file.
@@ -751,7 +794,7 @@
dialog = Gtk.FileChooserDialog(_('Save "%s" as…') % basename, self,
Gtk.FileChooserAction.SAVE, buttons)
dialog.set_default_response(Gtk.ResponseType.REJECT)
- dialog.set_current_name(basename)
+ dialog.set_current_name(basename.replace('�', '_'))
dialog.set_do_overwrite_confirmation(True)
response = dialog.run()
save_as = dialog.get_filename()
@@ -788,7 +831,7 @@
dialog = Gtk.MessageDialog(self, 0,
Gtk.MessageType.QUESTION,
Gtk.ButtonsType.NONE, "")
- dialog.set_markup(dialog_text)
+ dialog.set_markup(surrogate_escape(dialog_text))
dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.NO,
Gtk.STOCK_DELETE, Gtk.ResponseType.YES)
@@ -830,16 +873,9 @@
return True
def treemodel_get_row_filename(self, model, row):
- if self.options.icons_large or self.options.thumbnails:
- filename = model[row][1].split('\n')[0]
- filename = filename.split(' ')
- filename = ' '.join(filename[:len(filename)-2])
- filename = filename[3:-4]
- filename = unescape(filename)
- else:
- filename = model[row][1]
- folder = model[row][3]
- return os.path.join( folder, filename )
+ index = model[row][8]
+ filename = self.file_paths[index]
+ return filename
def treeview_get_selected_rows(self, treeview):
sel = treeview.get_selection()
@@ -923,7 +959,7 @@
def cell_data_func_filesize(self, column, cell_renderer,
tree_model, tree_iter, id):
"""File size cell display function."""
- if python3:
+ if pyversion >= 3.0:
size = int(tree_model.get_value(tree_iter, id))
else:
size = long(tree_model.get_value(tree_iter, id))
@@ -963,6 +999,10 @@
# mimetype
mimetype = model[iter][5]
use_filters = False
+ if self.filter_formats['folders']:
+ use_filters = True
+ if mimetype == 'inode/directory':
+ return True
if self.filter_formats['images']:
use_filters = True
if mimetype.startswith("image"):
@@ -1005,6 +1045,8 @@
n_results = len(self.treeview.get_model())
if n_results == 0:
self.statusbar.set_label( _("No files found.") )
+ elif n_results == 1:
+ self.statusbar.set_label( _("1 file found.") )
else:
self.statusbar.set_label( _("%i files found.") % n_results )
except AttributeError:
@@ -1063,20 +1105,43 @@
def get_thumbnail(self, path, mime_type=None):
"""Try to fetch a thumbnail."""
+ if pyversion >= 3.0:
+ path = path.encode()
+ thumbnails_directory = os.path.expanduser('~/.thumbnails/normal')
uri = 'file://' + path
- if python3:
- uri = uri.encode()
md5_hash = hashlib.md5(uri).hexdigest()
- for thumbnail_path in [os.path.join(self.folder_thumbnails, 'normal'),
- os.path.join(self.folder_thumbnails, 'small'),
- os.path.join(self.folder_thumbnails, 'large')]:
- filename = os.path.join(thumbnail_path, '%s.png' % md5_hash)
- if os.path.isfile(filename):
- try:
- return GdkPixbuf.Pixbuf.new_from_file(filename)
- except GError:
- pass
+ thumbnail_path = os.path.join(thumbnails_directory, '%s.png' % md5_hash)
+ if os.path.isfile(thumbnail_path):
+ try:
+ return GdkPixbuf.Pixbuf.new_from_file(thumbnail_path)
+ except GError:
+ pass
+ if mime_type.startswith('image'):
+ new_thumb = self.create_thumbnail(path, thumbnail_path)
+ if new_thumb:
+ return new_thumb
return self.get_file_icon(path, mime_type)
+
+ def create_thumbnail(self, filename, path):
+ try:
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename)
+ pixbuf_w = pixbuf.get_width()
+ pixbuf_h = pixbuf.get_height()
+ if pixbuf_w < 128 and pixbuf_h < 128:
+ pixbuf.savev(path, "png", [], [])
+ return pixbuf
+ if pixbuf_w > pixbuf_h:
+ thumb_w = 128
+ thumb_h = int(pixbuf_h / (pixbuf_w / 128.0))
+ else:
+ thumb_h = 128
+ thumb_w = int(pixbuf_w / (pixbuf_h / 128.0))
+ thumb_pixbuf = pixbuf.scale_simple(thumb_w, thumb_h, GdkPixbuf.InterpType.BILINEAR)
+ thumb_pixbuf.savev(path, "png", [], [])
+ return thumb_pixbuf
+ except Exception as e:
+ print (e)
+ return None
def get_file_icon(self, path, mime_type=None):
"""Retrieve the file icon."""
@@ -1137,18 +1202,14 @@
while Gtk.events_pending(): Gtk.main_iteration()
# icon, name, size, path, modified, mimetype, hidden, exact
- if python3:
- model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str, str, float, str,
- bool, bool)
- else:
- model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, long, str, float, str,
- bool, bool)
+ model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, GObject.TYPE_LONG, str, float, str,
+ bool, bool, int)
# Initialize the results filter.
self.results_filter = model.filter_new()
self.results_filter.set_visible_func(self.results_filter_func)
sort = Gtk.TreeModelSort(model=self.results_filter)
- if python3:
+ if pyversion >= 3.0:
sort.set_sort_func(2, self.python_three_size_sort_func, None)
self.treeview.set_model(sort)
self.treeview.columns_autosize()
@@ -1156,6 +1217,8 @@
folder = self.folderchooser.get_filename()
results = []
+ counter = 0
+ self.file_paths = []
# Check if this is a fulltext query or standard query.
if self.filter_formats['fulltext']:
@@ -1170,8 +1233,8 @@
try:
path, name = os.path.split(filename)
- if python3: # FIXME overflows with larger file sizes
- size = str(os.path.getsize(filename))
+ if pyversion >= 3.0:
+ size = int(os.path.getsize(filename))
else:
size = long(os.path.getsize(filename))
@@ -1190,6 +1253,8 @@
exact = keywords in name
results.append(filename)
+ self.file_paths.append(filename)
+
if self.options.icons_large or self.options.thumbnails:
displayed = '%s %s%s%s%s%s' % (escape(name),
@@ -1201,11 +1266,17 @@
else:
displayed = name
+ displayed = surrogate_escape(displayed, True)
+ path = surrogate_escape(path)
model.append([icon, displayed, size, path, modified,
- mimetype, hidden, exact])
+ mimetype, hidden, exact, counter])
except OSError:
# file no longer exists
pass
+ except Exception as e:
+ logger.error("Exception encountered: ", str(e))
+ counter += 1
+
yield True
continue
@@ -1217,6 +1288,8 @@
n_results = len(self.treeview.get_model())
if n_results == 0:
self.statusbar.set_label(_("No files found."))
+ elif n_results == 1:
+ self.statusbar.set_label( _("1 file found.") )
else:
self.statusbar.set_label(_("%i files found.") % n_results)
diff -Nru catfish-0.6.3/catfish/__init__.py catfish-0.8.2/catfish/__init__.py
--- catfish-0.6.3/catfish/__init__.py 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/catfish/__init__.py 2013-09-21 00:21:01.000000000 +0000
@@ -29,27 +29,30 @@
def parse_options():
"""Support for command line options"""
- parser = optparse.OptionParser(version="%%prog %s" % get_version())
+ parser = optparse.OptionParser(version="catfish %s" % get_version())
parser.add_option(
"-v", "--verbose", action="count", dest="verbose",
help=_("Show debug messages (-vv debugs catfish_lib also)"))
parser.add_option('', '--large-icons', action='store_true'
- , dest='icons_large', help='Use large icons')
+ , dest='icons_large', help=_('Use large icons'))
parser.add_option('', '--thumbnails', action='store_true'
- , dest='thumbnails', help='Use thumbnails')
+ , dest='thumbnails', help=_('Use thumbnails'))
parser.add_option('', '--iso-time', action='store_true'
- , dest='time_iso', help='Display time in iso format')
- parser.add_option('', '--path', help='Search in folder PATH')
- parser.add_option('', '--fileman', help='Use FILEMAN as filemanager')
+ , dest='time_iso', help=_('Display time in ISO format'))
+ # Translators: Do not translate PATH, it is a variable.
+ parser.add_option('', '--path', help=_('Search in folder PATH'))
+ # Translators: Do not translate FILEMAN, it is a variable.
+ parser.add_option('', '--fileman', help=_('Use FILEMAN as filemanager'))
parser.add_option('', '--wrapper', metavar='WRAPPER'
- , dest='open_wrapper', help='Use WRAPPER to open files')
+ # Translators: Do not translate WRAPPER, it is a variable.
+ , dest='open_wrapper', help=_('Use WRAPPER to open files'))
parser.add_option('', '--exact', action='store_true'
- , help='Perform exact match')
+ , help=_('Perform exact match'))
parser.add_option('', '--hidden', action='store_true'
- , help='Include hidden files')
+ , help=_('Include hidden files'))
parser.add_option('', '--fulltext', action='store_true'
- , help='Perform fulltext search')
+ , help=_('Perform fulltext search'))
parser.set_defaults(icons_large=0, thumbnails=0, time_iso=0
, path=os.path.expanduser('~'), fileman='xdg-open'
, exact=0, hidden=0, fulltext=0, file_action='open'
diff -Nru catfish-0.6.3/catfish_lib/CatfishSettings.py catfish-0.8.2/catfish_lib/CatfishSettings.py
--- catfish-0.6.3/catfish_lib/CatfishSettings.py 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/CatfishSettings.py 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,71 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+### BEGIN LICENSE
+# Copyright (C) 2007-2012 Christian Dywan
+# Copyright (C) 2012-2013 Sean Davis
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see .
+### END LICENSE
+
+import os
+
+default_settings_file = os.path.join(os.getenv('HOME'),
+ '.config/catfish/catfish.rc')
+default_settings = {'show-hidden-files': False, 'show-sidebar': False}
+
+class CatfishSettings:
+ def __init__(self, settings_file=default_settings_file):
+ try:
+ settings_dir = os.path.dirname(settings_file)
+ if not os.path.exists(settings_dir):
+ os.makedirs(settings_dir)
+ self.settings_file = settings_file
+ except:
+ self.settings_file = None
+ self.read()
+
+ def get_setting(self, key):
+ if key in self.settings:
+ return self.settings[key]
+ else:
+ return None
+
+ def set_setting(self, key, value):
+ if self.settings.has_key(key):
+ self.settings[key] = value
+ else:
+ pass
+
+ def read(self):
+ self.settings = default_settings.copy()
+ if os.path.isfile(self.settings_file):
+ for line in open(self.settings_file):
+ if not line.startswith('#'):
+ try:
+ prop, value = line.split('=')
+ if self.settings.has_key(prop):
+ if value.strip().lower() in ['true', 'false']:
+ value = value.strip().lower() == 'true'
+ self.settings[prop] = value
+ except:
+ pass
+
+ def write(self):
+ if self.settings_file:
+ write_file = open(self.settings_file, 'w')
+ for key in self.settings.keys():
+ value = self.settings[key]
+ if isinstance(value, bool):
+ value = str(value).lower()
+ else:
+ value = str(value)
+ write_file.write('%s=%s\n' % (key, value))
+ write_file.close()
diff -Nru catfish-0.6.3/catfish_lib/SudoDialog.py catfish-0.8.2/catfish_lib/SudoDialog.py
--- catfish-0.6.3/catfish_lib/SudoDialog.py 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/SudoDialog.py 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,222 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+### BEGIN LICENSE
+# Copyright (C) 2007-2012 Christian Dywan
+# Copyright (C) 2012-2013 Sean Davis
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see .
+### END LICENSE
+
+from gi.repository import Gtk, GdkPixbuf
+import os
+
+from locale import gettext as _
+
+from . import pexpect
+
+class SudoDialog(Gtk.MessageDialog):
+ '''
+ Creates a new SudoDialog. This is a replacement for using gksudo which
+ provides additional flexibility when performing sudo commands.
+
+ Only used to verify password by issuing 'sudo /bin/true'.
+
+ Keyword arguments:
+ - parent: Optional parent Gtk.Window
+ - icon: Optional icon name or path to image file.
+ - message: Optional message to be displayed instead of the defaults.
+ - name: Optional name to be displayed, for use when message is not used.
+ - retries: Optional maximum number of password attempts. -1 is unlimited.
+
+ Signals emitted by run():
+ - NONE: Dialog closed.
+ - CANCEL: Dialog cancelled.
+ - REJECT: Password invalid.
+ - ACCEPT: Password valid.
+ '''
+ def __init__(self, parent=None, icon=None, message=None, name=None,
+ retries=-1):
+ # default dialog parameters
+ flags = Gtk.DialogFlags.MODAL|Gtk.DialogFlags.DESTROY_WITH_PARENT
+ message_type = Gtk.MessageType.QUESTION
+ buttons = Gtk.ButtonsType.NONE
+
+ # initialize the dialog
+ super(SudoDialog, self).__init__(parent, flags, message_type, buttons,
+ message_format='')
+ self.set_dialog_icon(icon)
+ self.connect("show", self.on_show)
+
+ # add buttons
+ button_box = self.get_children()[0].get_children()[1]
+ self.add_button(_("Cancel"), Gtk.ResponseType.CANCEL)
+ ok_button = Gtk.Button.new_with_label(_("OK"))
+ ok_button.connect("clicked", self.on_ok_clicked)
+ ok_button.set_receives_default(True)
+ ok_button.set_can_default(True)
+ button_box.pack_start(ok_button, False, False, 0)
+
+ # add primary and secondary text
+ if message:
+ primary_text = message
+ secondary_text = None
+ else:
+ primary_text = _("Enter your password to\n"
+ "perform administrative tasks.")
+ secondary_text = _("The application '%s' lets you\n"
+ "modify essential parts of your system." % name)
+ self.format_primary_text(primary_text)
+ self.format_secondary_text(secondary_text)
+
+ # Pack the content area with password-related widgets.
+ content_area = self.get_content_area()
+
+ # Use an alignment to move align the password widgets with the text.
+ self.password_alignment = Gtk.Alignment()
+ # Make an educated guess about how for to align.
+ left_align = Gtk.icon_size_lookup(Gtk.IconSize.DIALOG)[1]+16
+ self.password_alignment.set_padding(12,12,left_align,0)
+
+ # Outer password box for incorrect password label and inner widgets.
+ password_outer = Gtk.Box(Gtk.Orientation.VERTICAL, 12)
+ password_outer.set_orientation(Gtk.Orientation.VERTICAL)
+ # Password error label, only displayed when unsuccessful.
+ self.password_info = Gtk.Label("")
+ self.password_info.set_markup("%s" %
+ _("Incorrect password... try again."))
+
+ # Inner password box for Password: label and password entry.
+ password_box = Gtk.Box(Gtk.Orientation.HORIZONTAL, 12)
+ password_label = Gtk.Label(_("Password:"))
+ self.password_entry = Gtk.Entry()
+ self.password_entry.set_visibility(False)
+ self.password_entry.set_activates_default(True)
+
+ # Pack all the widgets.
+ password_box.pack_start(password_label, False, False, 0)
+ password_box.pack_start(self.password_entry, True, True, 0)
+ password_outer.pack_start(self.password_info, True, True, 0)
+ password_outer.pack_start(password_box, True, True, 0)
+ self.password_alignment.add(password_outer)
+ content_area.pack_start(self.password_alignment, True, True, 0)
+ content_area.show_all()
+ self.password_info.set_visible(False)
+
+ self.attempted_logins = 0
+ self.max_attempted_logins = retries
+
+ def format_primary_text(self, message_format):
+ '''
+ Format the primary text widget.
+
+ API extension to match with format_secondary_text.
+ '''
+ label = self.get_message_area().get_children()[0]
+ label.set_text(message_format)
+
+ def set_dialog_icon(self, icon=None):
+ '''
+ Set the icon for the dialog. If the icon variable is an absolute
+ path, the icon is from an image file. Otherwise, set the icon from an
+ icon name.
+ '''
+ # default icon size is dialog.
+ icon_size = Gtk.IconSize.DIALOG
+ if icon:
+ if os.path.isfile(os.path.abspath(icon)):
+ # icon is a filename, so load it into a pixbuf to an image
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(icon,
+ icon_size,
+ icon_size)
+ image = Gtk.Image.new_from_pixbuf(pixbuf)
+ self.set_icon_from_file(icon)
+ else:
+ # icon is an named icon, so load it directly to an image
+ image = Gtk.Image.new_from_icon_name(icon, icon_size)
+ self.set_icon_name(icon)
+ else:
+ # fallback on password icon
+ image = Gtk.Image.new_from_icon_name('dialog-password', icon_size)
+ self.set_icon_name('dialog-password')
+ # align, show, and set the image.
+ image.set_alignment(Gtk.Align.CENTER, Gtk.Align.FILL)
+ image.show()
+ self.set_image(image)
+
+ def on_show(self, widget):
+ '''When the dialog is displayed, clear the password.'''
+ self.set_password('')
+
+ def on_ok_clicked(self, widget):
+ '''
+ When the OK button is clicked, attempt to use sudo with the currently
+ entered password. If successful, emit the response signal with ACCEPT.
+
+ If unsuccessful, try again until reaching maximum attempted logins,
+ then emit the response signal with REJECT.
+ '''
+ top, bottom, left, right = self.password_alignment.get_padding()
+ if self.attempt_login():
+ self.password_valid = True
+ # Adjust the dialog for attactiveness.
+ self.password_alignment.set_padding(12, bottom, left, right)
+ self.password_info.hide()
+ self.emit("response", Gtk.ResponseType.ACCEPT)
+ else:
+ self.password_valid = False
+ # Adjust the dialog for attactiveness.
+ self.password_alignment.set_padding(0, bottom, left, right)
+ self.password_info.show()
+ self.set_password('')
+ if self.attempted_logins == self.max_attempted_logins:
+ self.attempted_logins = 0
+ self.emit("response", Gtk.ResponseType.REJECT)
+
+ def get_password(self):
+ '''Return the currently entered password, or None if blank.'''
+ password = self.password_entry.get_text()
+ if password == '':
+ return None
+ return password
+
+ def set_password(self, text=None):
+ '''Set the password entry to the defined text.'''
+ if text == None:
+ text = ''
+ self.password_entry.set_text(text)
+ self.password_valid = False
+
+ def attempt_login(self):
+ '''
+ Try to use sudo with the current entered password.
+
+ Return True if successful.
+ '''
+ # Set the pexpect variables and spawn the process.
+ child = pexpect.spawn('sudo /bin/true')
+ child.timeout = 1
+ try:
+ # Check for password prompt or program exit.
+ child.expect([".*ssword.*", pexpect.EOF])
+ child.sendline(self.get_password())
+ child.expect(pexpect.EOF)
+ except pexpect.TIMEOUT:
+ # If we timeout, that means the password was unsuccessful.
+ pass
+ # Close the child process if it is still open.
+ child.close()
+ # Exit status 0 means success, anything else is an error.
+ if child.exitstatus == 0:
+ self.attempted_logins = 0
+ return True
+ else:
+ self.attempted_logins += 1
+ return False
\ No newline at end of file
diff -Nru catfish-0.6.3/catfish_lib/Window.py catfish-0.8.2/catfish_lib/Window.py
--- catfish-0.6.3/catfish_lib/Window.py 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/catfish_lib/Window.py 2013-09-21 00:21:01.000000000 +0000
@@ -95,6 +95,7 @@
def on_destroy(self, widget, data=None):
"""Called when the CatfishWindow is closed."""
self.search_engine.stop()
+ self.settings.write()
Gtk.main_quit()
def on_appmenu_button_clicked(self, widget):
diff -Nru catfish-0.6.3/catfish_lib/catfishconfig.py catfish-0.8.2/catfish_lib/catfishconfig.py
--- catfish-0.6.3/catfish_lib/catfishconfig.py 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/catfish_lib/catfishconfig.py 2013-09-21 00:21:01.000000000 +0000
@@ -27,7 +27,7 @@
# files). By default, this is ../data, relative your trunk layout
__catfish_data_directory__ = '../data/'
__license__ = 'GPL-2'
-__version__ = 'VERSION'
+__version__ = '0.8.2'
import os
diff -Nru catfish-0.6.3/catfish_lib/pexpect/ANSI.py catfish-0.8.2/catfish_lib/pexpect/ANSI.py
--- catfish-0.6.3/catfish_lib/pexpect/ANSI.py 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/pexpect/ANSI.py 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,352 @@
+"""This implements an ANSI (VT100) terminal emulator as a subclass of screen.
+
+$Id: ANSI.py 525 2010-10-31 14:30:37Z noah $
+"""
+
+# references:
+# http://en.wikipedia.org/wiki/ANSI_escape_code
+# http://www.retards.org/terminals/vt102.html
+# http://vt100.net/docs/vt102-ug/contents.html
+# http://vt100.net/docs/vt220-rm/
+# http://www.termsys.demon.co.uk/vtansi.htm
+
+from . import screen
+from . import FSM
+import copy
+import string
+
+#
+# The 'Do.*' functions are helper functions for the ANSI class.
+#
+def DoEmit (fsm):
+
+ screen = fsm.memory[0]
+ screen.write_ch(fsm.input_symbol)
+
+def DoStartNumber (fsm):
+
+ fsm.memory.append (fsm.input_symbol)
+
+def DoBuildNumber (fsm):
+
+ ns = fsm.memory.pop()
+ ns = ns + fsm.input_symbol
+ fsm.memory.append (ns)
+
+def DoBackOne (fsm):
+
+ screen = fsm.memory[0]
+ screen.cursor_back ()
+
+def DoBack (fsm):
+
+ count = int(fsm.memory.pop())
+ screen = fsm.memory[0]
+ screen.cursor_back (count)
+
+def DoDownOne (fsm):
+
+ screen = fsm.memory[0]
+ screen.cursor_down ()
+
+def DoDown (fsm):
+
+ count = int(fsm.memory.pop())
+ screen = fsm.memory[0]
+ screen.cursor_down (count)
+
+def DoForwardOne (fsm):
+
+ screen = fsm.memory[0]
+ screen.cursor_forward ()
+
+def DoForward (fsm):
+
+ count = int(fsm.memory.pop())
+ screen = fsm.memory[0]
+ screen.cursor_forward (count)
+
+def DoUpReverse (fsm):
+
+ screen = fsm.memory[0]
+ screen.cursor_up_reverse()
+
+def DoUpOne (fsm):
+
+ screen = fsm.memory[0]
+ screen.cursor_up ()
+
+def DoUp (fsm):
+
+ count = int(fsm.memory.pop())
+ screen = fsm.memory[0]
+ screen.cursor_up (count)
+
+def DoHome (fsm):
+
+ c = int(fsm.memory.pop())
+ r = int(fsm.memory.pop())
+ screen = fsm.memory[0]
+ screen.cursor_home (r,c)
+
+def DoHomeOrigin (fsm):
+
+ c = 1
+ r = 1
+ screen = fsm.memory[0]
+ screen.cursor_home (r,c)
+
+def DoEraseDown (fsm):
+
+ screen = fsm.memory[0]
+ screen.erase_down()
+
+def DoErase (fsm):
+
+ arg = int(fsm.memory.pop())
+ screen = fsm.memory[0]
+ if arg == 0:
+ screen.erase_down()
+ elif arg == 1:
+ screen.erase_up()
+ elif arg == 2:
+ screen.erase_screen()
+
+def DoEraseEndOfLine (fsm):
+
+ screen = fsm.memory[0]
+ screen.erase_end_of_line()
+
+def DoEraseLine (fsm):
+
+ arg = int(fsm.memory.pop())
+ screen = fsm.memory[0]
+ if arg == 0:
+ screen.erase_end_of_line()
+ elif arg == 1:
+ screen.erase_start_of_line()
+ elif arg == 2:
+ screen.erase_line()
+
+def DoEnableScroll (fsm):
+
+ screen = fsm.memory[0]
+ screen.scroll_screen()
+
+def DoCursorSave (fsm):
+
+ screen = fsm.memory[0]
+ screen.cursor_save_attrs()
+
+def DoCursorRestore (fsm):
+
+ screen = fsm.memory[0]
+ screen.cursor_restore_attrs()
+
+def DoScrollRegion (fsm):
+
+ screen = fsm.memory[0]
+ r2 = int(fsm.memory.pop())
+ r1 = int(fsm.memory.pop())
+ screen.scroll_screen_rows (r1,r2)
+
+def DoMode (fsm):
+
+ screen = fsm.memory[0]
+ mode = fsm.memory.pop() # Should be 4
+ # screen.setReplaceMode ()
+
+def DoLog (fsm):
+
+ screen = fsm.memory[0]
+ fsm.memory = [screen]
+ fout = open ('log', 'a')
+ fout.write (fsm.input_symbol + ',' + fsm.current_state + '\n')
+ fout.close()
+
+class term (screen.screen):
+
+ """This class is an abstract, generic terminal.
+ This does nothing. This is a placeholder that
+ provides a common base class for other terminals
+ such as an ANSI terminal. """
+
+ def __init__ (self, r=24, c=80):
+
+ screen.screen.__init__(self, r,c)
+
+class ANSI (term):
+
+ """This class implements an ANSI (VT100) terminal.
+ It is a stream filter that recognizes ANSI terminal
+ escape sequences and maintains the state of a screen object. """
+
+ def __init__ (self, r=24,c=80):
+
+ term.__init__(self,r,c)
+
+ #self.screen = screen (24,80)
+ self.state = FSM.FSM ('INIT',[self])
+ self.state.set_default_transition (DoLog, 'INIT')
+ self.state.add_transition_any ('INIT', DoEmit, 'INIT')
+ self.state.add_transition ('\x1b', 'INIT', None, 'ESC')
+ self.state.add_transition_any ('ESC', DoLog, 'INIT')
+ self.state.add_transition ('(', 'ESC', None, 'G0SCS')
+ self.state.add_transition (')', 'ESC', None, 'G1SCS')
+ self.state.add_transition_list ('AB012', 'G0SCS', None, 'INIT')
+ self.state.add_transition_list ('AB012', 'G1SCS', None, 'INIT')
+ self.state.add_transition ('7', 'ESC', DoCursorSave, 'INIT')
+ self.state.add_transition ('8', 'ESC', DoCursorRestore, 'INIT')
+ self.state.add_transition ('M', 'ESC', DoUpReverse, 'INIT')
+ self.state.add_transition ('>', 'ESC', DoUpReverse, 'INIT')
+ self.state.add_transition ('<', 'ESC', DoUpReverse, 'INIT')
+ self.state.add_transition ('=', 'ESC', None, 'INIT') # Selects application keypad.
+ self.state.add_transition ('#', 'ESC', None, 'GRAPHICS_POUND')
+ self.state.add_transition_any ('GRAPHICS_POUND', None, 'INIT')
+ self.state.add_transition ('[', 'ESC', None, 'ELB')
+ # ELB means Escape Left Bracket. That is ^[[
+ self.state.add_transition ('H', 'ELB', DoHomeOrigin, 'INIT')
+ self.state.add_transition ('D', 'ELB', DoBackOne, 'INIT')
+ self.state.add_transition ('B', 'ELB', DoDownOne, 'INIT')
+ self.state.add_transition ('C', 'ELB', DoForwardOne, 'INIT')
+ self.state.add_transition ('A', 'ELB', DoUpOne, 'INIT')
+ self.state.add_transition ('J', 'ELB', DoEraseDown, 'INIT')
+ self.state.add_transition ('K', 'ELB', DoEraseEndOfLine, 'INIT')
+ self.state.add_transition ('r', 'ELB', DoEnableScroll, 'INIT')
+ self.state.add_transition ('m', 'ELB', None, 'INIT')
+ self.state.add_transition ('?', 'ELB', None, 'MODECRAP')
+ self.state.add_transition_list (string.digits, 'ELB', DoStartNumber, 'NUMBER_1')
+ self.state.add_transition_list (string.digits, 'NUMBER_1', DoBuildNumber, 'NUMBER_1')
+ self.state.add_transition ('D', 'NUMBER_1', DoBack, 'INIT')
+ self.state.add_transition ('B', 'NUMBER_1', DoDown, 'INIT')
+ self.state.add_transition ('C', 'NUMBER_1', DoForward, 'INIT')
+ self.state.add_transition ('A', 'NUMBER_1', DoUp, 'INIT')
+ self.state.add_transition ('J', 'NUMBER_1', DoErase, 'INIT')
+ self.state.add_transition ('K', 'NUMBER_1', DoEraseLine, 'INIT')
+ self.state.add_transition ('l', 'NUMBER_1', DoMode, 'INIT')
+ ### It gets worse... the 'm' code can have infinite number of
+ ### number;number;number before it. I've never seen more than two,
+ ### but the specs say it's allowed. crap!
+ self.state.add_transition ('m', 'NUMBER_1', None, 'INIT')
+ ### LED control. Same implementation problem as 'm' code.
+ self.state.add_transition ('q', 'NUMBER_1', None, 'INIT')
+
+ # \E[?47h switch to alternate screen
+ # \E[?47l restores to normal screen from alternate screen.
+ self.state.add_transition_list (string.digits, 'MODECRAP', DoStartNumber, 'MODECRAP_NUM')
+ self.state.add_transition_list (string.digits, 'MODECRAP_NUM', DoBuildNumber, 'MODECRAP_NUM')
+ self.state.add_transition ('l', 'MODECRAP_NUM', None, 'INIT')
+ self.state.add_transition ('h', 'MODECRAP_NUM', None, 'INIT')
+
+#RM Reset Mode Esc [ Ps l none
+ self.state.add_transition (';', 'NUMBER_1', None, 'SEMICOLON')
+ self.state.add_transition_any ('SEMICOLON', DoLog, 'INIT')
+ self.state.add_transition_list (string.digits, 'SEMICOLON', DoStartNumber, 'NUMBER_2')
+ self.state.add_transition_list (string.digits, 'NUMBER_2', DoBuildNumber, 'NUMBER_2')
+ self.state.add_transition_any ('NUMBER_2', DoLog, 'INIT')
+ self.state.add_transition ('H', 'NUMBER_2', DoHome, 'INIT')
+ self.state.add_transition ('f', 'NUMBER_2', DoHome, 'INIT')
+ self.state.add_transition ('r', 'NUMBER_2', DoScrollRegion, 'INIT')
+ ### It gets worse... the 'm' code can have infinite number of
+ ### number;number;number before it. I've never seen more than two,
+ ### but the specs say it's allowed. crap!
+ self.state.add_transition ('m', 'NUMBER_2', None, 'INIT')
+ ### LED control. Same problem as 'm' code.
+ self.state.add_transition ('q', 'NUMBER_2', None, 'INIT')
+ self.state.add_transition (';', 'NUMBER_2', None, 'SEMICOLON_X')
+
+ # Create a state for 'q' and 'm' which allows an infinite number of ignored numbers
+ self.state.add_transition_any ('SEMICOLON_X', DoLog, 'INIT')
+ self.state.add_transition_list (string.digits, 'SEMICOLON_X', None, 'NUMBER_X')
+ self.state.add_transition_any ('NUMBER_X', DoLog, 'INIT')
+ self.state.add_transition ('m', 'NUMBER_X', None, 'INIT')
+ self.state.add_transition ('q', 'NUMBER_X', None, 'INIT')
+ self.state.add_transition (';', 'NUMBER_2', None, 'SEMICOLON_X')
+
+ def process (self, c):
+
+ self.state.process(c)
+
+ def process_list (self, l):
+
+ self.write(l)
+
+ def write (self, s):
+
+ for c in s:
+ self.process(c)
+
+ def flush (self):
+
+ pass
+
+ def write_ch (self, ch):
+
+ """This puts a character at the current cursor position. The cursor
+ position is moved forward with wrap-around, but no scrolling is done if
+ the cursor hits the lower-right corner of the screen. """
+
+ #\r and \n both produce a call to cr() and lf(), respectively.
+ ch = ch[0]
+
+ if ch == '\r':
+ self.cr()
+ return
+ if ch == '\n':
+ self.crlf()
+ return
+ if ch == chr(screen.BS):
+ self.cursor_back()
+ return
+ if ch not in string.printable:
+ fout = open ('log', 'a')
+ fout.write ('Nonprint: ' + str(ord(ch)) + '\n')
+ fout.close()
+ return
+ self.put_abs(self.cur_r, self.cur_c, ch)
+ old_r = self.cur_r
+ old_c = self.cur_c
+ self.cursor_forward()
+ if old_c == self.cur_c:
+ self.cursor_down()
+ if old_r != self.cur_r:
+ self.cursor_home (self.cur_r, 1)
+ else:
+ self.scroll_up ()
+ self.cursor_home (self.cur_r, 1)
+ self.erase_line()
+
+# def test (self):
+#
+# import sys
+# write_text = 'I\'ve got a ferret sticking up my nose.\n' + \
+# '(He\'s got a ferret sticking up his nose.)\n' + \
+# 'How it got there I can\'t tell\n' + \
+# 'But now it\'s there it hurts like hell\n' + \
+# 'And what is more it radically affects my sense of smell.\n' + \
+# '(His sense of smell.)\n' + \
+# 'I can see a bare-bottomed mandril.\n' + \
+# '(Slyly eyeing his other nostril.)\n' + \
+# 'If it jumps inside there too I really don\'t know what to do\n' + \
+# 'I\'ll be the proud posessor of a kind of nasal zoo.\n' + \
+# '(A nasal zoo.)\n' + \
+# 'I\'ve got a ferret sticking up my nose.\n' + \
+# '(And what is worst of all it constantly explodes.)\n' + \
+# '"Ferrets don\'t explode," you say\n' + \
+# 'But it happened nine times yesterday\n' + \
+# 'And I should know for each time I was standing in the way.\n' + \
+# 'I\'ve got a ferret sticking up my nose.\n' + \
+# '(He\'s got a ferret sticking up his nose.)\n' + \
+# 'How it got there I can\'t tell\n' + \
+# 'But now it\'s there it hurts like hell\n' + \
+# 'And what is more it radically affects my sense of smell.\n' + \
+# '(His sense of smell.)'
+# self.fill('.')
+# self.cursor_home()
+# for c in write_text:
+# self.write_ch (c)
+# print str(self)
+#
+#if __name__ == '__main__':
+# t = ANSI(6,65)
+# t.test()
diff -Nru catfish-0.6.3/catfish_lib/pexpect/FSM.py catfish-0.8.2/catfish_lib/pexpect/FSM.py
--- catfish-0.6.3/catfish_lib/pexpect/FSM.py 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/pexpect/FSM.py 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,331 @@
+#!/usr/bin/env python
+
+"""This module implements a Finite State Machine (FSM). In addition to state
+this FSM also maintains a user defined "memory". So this FSM can be used as a
+Push-down Automata (PDA) since a PDA is a FSM + memory.
+
+The following describes how the FSM works, but you will probably also need to
+see the example function to understand how the FSM is used in practice.
+
+You define an FSM by building tables of transitions. For a given input symbol
+the process() method uses these tables to decide what action to call and what
+the next state will be. The FSM has a table of transitions that associate:
+
+ (input_symbol, current_state) --> (action, next_state)
+
+Where "action" is a function you define. The symbols and states can be any
+objects. You use the add_transition() and add_transition_list() methods to add
+to the transition table. The FSM also has a table of transitions that
+associate:
+
+ (current_state) --> (action, next_state)
+
+You use the add_transition_any() method to add to this transition table. The
+FSM also has one default transition that is not associated with any specific
+input_symbol or state. You use the set_default_transition() method to set the
+default transition.
+
+When an action function is called it is passed a reference to the FSM. The
+action function may then access attributes of the FSM such as input_symbol,
+current_state, or "memory". The "memory" attribute can be any object that you
+want to pass along to the action functions. It is not used by the FSM itself.
+For parsing you would typically pass a list to be used as a stack.
+
+The processing sequence is as follows. The process() method is given an
+input_symbol to process. The FSM will search the table of transitions that
+associate:
+
+ (input_symbol, current_state) --> (action, next_state)
+
+If the pair (input_symbol, current_state) is found then process() will call the
+associated action function and then set the current state to the next_state.
+
+If the FSM cannot find a match for (input_symbol, current_state) it will then
+search the table of transitions that associate:
+
+ (current_state) --> (action, next_state)
+
+If the current_state is found then the process() method will call the
+associated action function and then set the current state to the next_state.
+Notice that this table lacks an input_symbol. It lets you define transitions
+for a current_state and ANY input_symbol. Hence, it is called the "any" table.
+Remember, it is always checked after first searching the table for a specific
+(input_symbol, current_state).
+
+For the case where the FSM did not match either of the previous two cases the
+FSM will try to use the default transition. If the default transition is
+defined then the process() method will call the associated action function and
+then set the current state to the next_state. This lets you define a default
+transition as a catch-all case. You can think of it as an exception handler.
+There can be only one default transition.
+
+Finally, if none of the previous cases are defined for an input_symbol and
+current_state then the FSM will raise an exception. This may be desirable, but
+you can always prevent this just by defining a default transition.
+
+Noah Spurrier 20020822
+"""
+
+class ExceptionFSM(Exception):
+
+ """This is the FSM Exception class."""
+
+ def __init__(self, value):
+ self.value = value
+
+ def __str__(self):
+ return repr(self.value)
+
+class FSM:
+
+ """This is a Finite State Machine (FSM).
+ """
+
+ def __init__(self, initial_state, memory=None):
+
+ """This creates the FSM. You set the initial state here. The "memory"
+ attribute is any object that you want to pass along to the action
+ functions. It is not used by the FSM. For parsing you would typically
+ pass a list to be used as a stack. """
+
+ # Map (input_symbol, current_state) --> (action, next_state).
+ self.state_transitions = {}
+ # Map (current_state) --> (action, next_state).
+ self.state_transitions_any = {}
+ self.default_transition = None
+
+ self.input_symbol = None
+ self.initial_state = initial_state
+ self.current_state = self.initial_state
+ self.next_state = None
+ self.action = None
+ self.memory = memory
+
+ def reset (self):
+
+ """This sets the current_state to the initial_state and sets
+ input_symbol to None. The initial state was set by the constructor
+ __init__(). """
+
+ self.current_state = self.initial_state
+ self.input_symbol = None
+
+ def add_transition (self, input_symbol, state, action=None, next_state=None):
+
+ """This adds a transition that associates:
+
+ (input_symbol, current_state) --> (action, next_state)
+
+ The action may be set to None in which case the process() method will
+ ignore the action and only set the next_state. The next_state may be
+ set to None in which case the current state will be unchanged.
+
+ You can also set transitions for a list of symbols by using
+ add_transition_list(). """
+
+ if next_state is None:
+ next_state = state
+ self.state_transitions[(input_symbol, state)] = (action, next_state)
+
+ def add_transition_list (self, list_input_symbols, state, action=None, next_state=None):
+
+ """This adds the same transition for a list of input symbols.
+ You can pass a list or a string. Note that it is handy to use
+ string.digits, string.whitespace, string.letters, etc. to add
+ transitions that match character classes.
+
+ The action may be set to None in which case the process() method will
+ ignore the action and only set the next_state. The next_state may be
+ set to None in which case the current state will be unchanged. """
+
+ if next_state is None:
+ next_state = state
+ for input_symbol in list_input_symbols:
+ self.add_transition (input_symbol, state, action, next_state)
+
+ def add_transition_any (self, state, action=None, next_state=None):
+
+ """This adds a transition that associates:
+
+ (current_state) --> (action, next_state)
+
+ That is, any input symbol will match the current state.
+ The process() method checks the "any" state associations after it first
+ checks for an exact match of (input_symbol, current_state).
+
+ The action may be set to None in which case the process() method will
+ ignore the action and only set the next_state. The next_state may be
+ set to None in which case the current state will be unchanged. """
+
+ if next_state is None:
+ next_state = state
+ self.state_transitions_any [state] = (action, next_state)
+
+ def set_default_transition (self, action, next_state):
+
+ """This sets the default transition. This defines an action and
+ next_state if the FSM cannot find the input symbol and the current
+ state in the transition list and if the FSM cannot find the
+ current_state in the transition_any list. This is useful as a final
+ fall-through state for catching errors and undefined states.
+
+ The default transition can be removed by setting the attribute
+ default_transition to None. """
+
+ self.default_transition = (action, next_state)
+
+ def get_transition (self, input_symbol, state):
+
+ """This returns (action, next state) given an input_symbol and state.
+ This does not modify the FSM state, so calling this method has no side
+ effects. Normally you do not call this method directly. It is called by
+ process().
+
+ The sequence of steps to check for a defined transition goes from the
+ most specific to the least specific.
+
+ 1. Check state_transitions[] that match exactly the tuple,
+ (input_symbol, state)
+
+ 2. Check state_transitions_any[] that match (state)
+ In other words, match a specific state and ANY input_symbol.
+
+ 3. Check if the default_transition is defined.
+ This catches any input_symbol and any state.
+ This is a handler for errors, undefined states, or defaults.
+
+ 4. No transition was defined. If we get here then raise an exception.
+ """
+
+ if (input_symbol, state) in self.state_transitions:
+ return self.state_transitions[(input_symbol, state)]
+ elif state in self.state_transitions_any:
+ return self.state_transitions_any[state]
+ elif self.default_transition is not None:
+ return self.default_transition
+ else:
+ raise ExceptionFSM ('Transition is undefined: (%s, %s).' %
+ (str(input_symbol), str(state)) )
+
+ def process (self, input_symbol):
+
+ """This is the main method that you call to process input. This may
+ cause the FSM to change state and call an action. This method calls
+ get_transition() to find the action and next_state associated with the
+ input_symbol and current_state. If the action is None then the action
+ is not called and only the current state is changed. This method
+ processes one complete input symbol. You can process a list of symbols
+ (or a string) by calling process_list(). """
+
+ self.input_symbol = input_symbol
+ (self.action, self.next_state) = self.get_transition (self.input_symbol, self.current_state)
+ if self.action is not None:
+ self.action (self)
+ self.current_state = self.next_state
+ self.next_state = None
+
+ def process_list (self, input_symbols):
+
+ """This takes a list and sends each element to process(). The list may
+ be a string or any iterable object. """
+
+ for s in input_symbols:
+ self.process (s)
+
+##############################################################################
+# The following is an example that demonstrates the use of the FSM class to
+# process an RPN expression. Run this module from the command line. You will
+# get a prompt > for input. Enter an RPN Expression. Numbers may be integers.
+# Operators are * / + - Use the = sign to evaluate and print the expression.
+# For example:
+#
+# 167 3 2 2 * * * 1 - =
+#
+# will print:
+#
+# 2003
+##############################################################################
+
+import sys, os, traceback, optparse, time, string
+
+#
+# These define the actions.
+# Note that "memory" is a list being used as a stack.
+#
+
+def BeginBuildNumber (fsm):
+ fsm.memory.append (fsm.input_symbol)
+
+def BuildNumber (fsm):
+ s = fsm.memory.pop ()
+ s = s + fsm.input_symbol
+ fsm.memory.append (s)
+
+def EndBuildNumber (fsm):
+ s = fsm.memory.pop ()
+ fsm.memory.append (int(s))
+
+def DoOperator (fsm):
+ ar = fsm.memory.pop()
+ al = fsm.memory.pop()
+ if fsm.input_symbol == '+':
+ fsm.memory.append (al + ar)
+ elif fsm.input_symbol == '-':
+ fsm.memory.append (al - ar)
+ elif fsm.input_symbol == '*':
+ fsm.memory.append (al * ar)
+ elif fsm.input_symbol == '/':
+ fsm.memory.append (al / ar)
+
+def DoEqual (fsm):
+ print(str(fsm.memory.pop()))
+
+def Error (fsm):
+ print('That does not compute.')
+ print(str(fsm.input_symbol))
+
+def main():
+
+ """This is where the example starts and the FSM state transitions are
+ defined. Note that states are strings (such as 'INIT'). This is not
+ necessary, but it makes the example easier to read. """
+
+ f = FSM ('INIT', []) # "memory" will be used as a stack.
+ f.set_default_transition (Error, 'INIT')
+ f.add_transition_any ('INIT', None, 'INIT')
+ f.add_transition ('=', 'INIT', DoEqual, 'INIT')
+ f.add_transition_list (string.digits, 'INIT', BeginBuildNumber, 'BUILDING_NUMBER')
+ f.add_transition_list (string.digits, 'BUILDING_NUMBER', BuildNumber, 'BUILDING_NUMBER')
+ f.add_transition_list (string.whitespace, 'BUILDING_NUMBER', EndBuildNumber, 'INIT')
+ f.add_transition_list ('+-*/', 'INIT', DoOperator, 'INIT')
+
+ print()
+ print('Enter an RPN Expression.')
+ print('Numbers may be integers. Operators are * / + -')
+ print('Use the = sign to evaluate and print the expression.')
+ print('For example: ')
+ print(' 167 3 2 2 * * * 1 - =')
+ inputstr = input ('> ')
+ f.process_list(inputstr)
+
+if __name__ == '__main__':
+ try:
+ start_time = time.time()
+ parser = optparse.OptionParser(formatter=optparse.TitledHelpFormatter(), usage=globals()['__doc__'], version='$Id: FSM.py 490 2007-12-07 15:46:24Z noah $')
+ parser.add_option ('-v', '--verbose', action='store_true', default=False, help='verbose output')
+ (options, args) = parser.parse_args()
+ if options.verbose: print(time.asctime())
+ main()
+ if options.verbose: print(time.asctime())
+ if options.verbose: print('TOTAL TIME IN MINUTES: ')
+ if options.verbose: print((time.time() - start_time) / 60.0)
+ sys.exit(0)
+ except KeyboardInterrupt as e: # Ctrl-C
+ raise e
+ except SystemExit as e: # sys.exit()
+ raise e
+ except Exception as e:
+ print('ERROR, UNEXPECTED EXCEPTION')
+ print(str(e))
+ traceback.print_exc()
+ os._exit(1)
diff -Nru catfish-0.6.3/catfish_lib/pexpect/LICENSE catfish-0.8.2/catfish_lib/pexpect/LICENSE
--- catfish-0.6.3/catfish_lib/pexpect/LICENSE 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/pexpect/LICENSE 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,21 @@
+Free, open source, and all that good stuff.
+Pexpect Copyright (c) 2008 Noah Spurrier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff -Nru catfish-0.6.3/catfish_lib/pexpect/README catfish-0.8.2/catfish_lib/pexpect/README
--- catfish-0.6.3/catfish_lib/pexpect/README 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/pexpect/README 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,45 @@
+Pexpect is a Pure Python Expect-like module
+
+Pexpect makes Python a better tool for controlling other applications.
+
+Pexpect is a pure Python module for spawning child applications; controlling
+them; and responding to expected patterns in their output. Pexpect works like
+Don Libes' Expect. Pexpect allows your script to spawn a child application and
+control it as if a human were typing commands.
+
+Pexpect can be used for automating interactive applications such as ssh, ftp,
+passwd, telnet, etc. It can be used to a automate setup scripts for
+duplicating software package installations on different servers. It can be
+used for automated software testing. Pexpect is in the spirit of Don Libes'
+Expect, but Pexpect is pure Python. Unlike other Expect-like modules for
+Python, Pexpect does not require TCL or Expect nor does it require C
+extensions to be compiled. It should work on any platform that supports the
+standard Python pty module. The Pexpect interface was designed to be easy to use.
+
+If you want to work with the development version of the source code then please
+read the DEVELOPERS document in the root of the source code tree.
+
+Free, open source, and all that good stuff.
+Pexpect Copyright (c) 2008 Noah Spurrier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Noah Spurrier
+http://pexpect.sourceforge.net/
+
diff -Nru catfish-0.6.3/catfish_lib/pexpect/__init__.py catfish-0.8.2/catfish_lib/pexpect/__init__.py
--- catfish-0.6.3/catfish_lib/pexpect/__init__.py 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/pexpect/__init__.py 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,1900 @@
+"""Pexpect is a Python module for spawning child applications and controlling
+them automatically. Pexpect can be used for automating interactive applications
+such as ssh, ftp, passwd, telnet, etc. It can be used to a automate setup
+scripts for duplicating software package installations on different servers. It
+can be used for automated software testing. Pexpect is in the spirit of Don
+Libes' Expect, but Pexpect is pure Python. Other Expect-like modules for Python
+require TCL and Expect or require C extensions to be compiled. Pexpect does not
+use C, Expect, or TCL extensions. It should work on any platform that supports
+the standard Python pty module. The Pexpect interface focuses on ease of use so
+that simple tasks are easy.
+
+There are two main interfaces to the Pexpect system; these are the function,
+run() and the class, spawn. The spawn class is more powerful. The run()
+function is simpler than spawn, and is good for quickly calling program. When
+you call the run() function it executes a given program and then returns the
+output. This is a handy replacement for os.system().
+
+For example::
+
+ pexpect.run('ls -la')
+
+The spawn class is the more powerful interface to the Pexpect system. You can
+use this to spawn a child program then interact with it by sending input and
+expecting responses (waiting for patterns in the child's output).
+
+For example::
+
+ child = pexpect.spawn('scp foo myname@host.example.com:.')
+ child.expect ('Password:')
+ child.sendline (mypassword)
+
+This works even for commands that ask for passwords or other input outside of
+the normal stdio streams. For example, ssh reads input directly from the TTY
+device which bypasses stdin.
+
+Credits: Noah Spurrier, Richard Holden, Marco Molteni, Kimberley Burchett,
+Robert Stone, Hartmut Goebel, Chad Schroeder, Erick Tryzelaar, Dave Kirby, Ids
+vander Molen, George Todd, Noel Taylor, Nicolas D. Cesar, Alexander Gattin,
+Jacques-Etienne Baudoux, Geoffrey Marshall, Francisco Lourenco, Glen Mabey,
+Karthik Gurusamy, Fernando Perez, Corey Minyard, Jon Cohen, Guillaume
+Chazarain, Andrew Ryan, Nick Craig-Wood, Andrew Stone, Jorgen Grahn, John
+Spiegel, Jan Grant, Shane Kerr and Thomas Kluyver. Let me know if I forgot anyone.
+
+Pexpect is free, open source, and all that good stuff.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Pexpect Copyright (c) 2010 Noah Spurrier
+http://pexpect.sourceforge.net/
+"""
+
+try:
+ import os, sys, time
+ import select
+ import re
+ import struct
+ import resource
+ import types
+ import pty
+ import tty
+ import termios
+ import fcntl
+ import errno
+ import traceback
+ import signal
+except ImportError as e:
+ raise ImportError (str(e) + """
+
+A critical module was not found. Probably this operating system does not
+support it. Pexpect is intended for UNIX-like operating systems.""")
+
+__version__ = '2.5.1'
+version = __version__
+version_info = (2,5,1)
+__all__ = ['ExceptionPexpect', 'EOF', 'TIMEOUT', 'spawn', 'spawnb', 'run', 'which',
+ 'split_command_line', '__version__']
+
+# Exception classes used by this module.
+class ExceptionPexpect(Exception):
+
+ """Base class for all exceptions raised by this module.
+ """
+
+ def __init__(self, value):
+
+ self.value = value
+
+ def __str__(self):
+
+ return str(self.value)
+
+ def get_trace(self):
+
+ """This returns an abbreviated stack trace with lines that only concern
+ the caller. In other words, the stack trace inside the Pexpect module
+ is not included. """
+
+ tblist = traceback.extract_tb(sys.exc_info()[2])
+ #tblist = filter(self.__filter_not_pexpect, tblist)
+ tblist = [item for item in tblist if self.__filter_not_pexpect(item)]
+ tblist = traceback.format_list(tblist)
+ return ''.join(tblist)
+
+ def __filter_not_pexpect(self, trace_list_item):
+
+ """This returns True if list item 0 the string 'pexpect.py' in it. """
+
+ if trace_list_item[0].find('pexpect.py') == -1:
+ return True
+ else:
+ return False
+
+class EOF(ExceptionPexpect):
+
+ """Raised when EOF is read from a child. This usually means the child has exited."""
+
+class TIMEOUT(ExceptionPexpect):
+
+ """Raised when a read time exceeds the timeout. """
+
+##class TIMEOUT_PATTERN(TIMEOUT):
+## """Raised when the pattern match time exceeds the timeout.
+## This is different than a read TIMEOUT because the child process may
+## give output, thus never give a TIMEOUT, but the output
+## may never match a pattern.
+## """
+##class MAXBUFFER(ExceptionPexpect):
+## """Raised when a scan buffer fills before matching an expected pattern."""
+
+PY3 = (sys.version_info[0] >= 3)
+
+def _cast_bytes(s, enc):
+ if isinstance(s, str):
+ return s.encode(enc)
+ return s
+
+def _cast_unicode(s, enc):
+ if isinstance(s, bytes):
+ return s.decode(enc)
+ return s
+
+re_type = type(re.compile(''))
+
+def run (command, timeout=-1, withexitstatus=False, events=None, extra_args=None,
+ logfile=None, cwd=None, env=None, encoding='utf-8'):
+
+ """
+ This function runs the given command; waits for it to finish; then
+ returns all output as a string. STDERR is included in output. If the full
+ path to the command is not given then the path is searched.
+
+ Note that lines are terminated by CR/LF (\\r\\n) combination even on
+ UNIX-like systems because this is the standard for pseudo ttys. If you set
+ 'withexitstatus' to true, then run will return a tuple of (command_output,
+ exitstatus). If 'withexitstatus' is false then this returns just
+ command_output.
+
+ The run() function can often be used instead of creating a spawn instance.
+ For example, the following code uses spawn::
+
+ from pexpect import *
+ child = spawn('scp foo myname@host.example.com:.')
+ child.expect ('(?i)password')
+ child.sendline (mypassword)
+
+ The previous code can be replace with the following::
+
+ from pexpect import *
+ run ('scp foo myname@host.example.com:.', events={'(?i)password': mypassword})
+
+ Examples
+ ========
+
+ Start the apache daemon on the local machine::
+
+ from pexpect import *
+ run ("/usr/local/apache/bin/apachectl start")
+
+ Check in a file using SVN::
+
+ from pexpect import *
+ run ("svn ci -m 'automatic commit' my_file.py")
+
+ Run a command and capture exit status::
+
+ from pexpect import *
+ (command_output, exitstatus) = run ('ls -l /bin', withexitstatus=1)
+
+ Tricky Examples
+ ===============
+
+ The following will run SSH and execute 'ls -l' on the remote machine. The
+ password 'secret' will be sent if the '(?i)password' pattern is ever seen::
+
+ run ("ssh username@machine.example.com 'ls -l'", events={'(?i)password':'secret\\n'})
+
+ This will start mencoder to rip a video from DVD. This will also display
+ progress ticks every 5 seconds as it runs. For example::
+
+ from pexpect import *
+ def print_ticks(d):
+ print d['event_count'],
+ run ("mencoder dvd://1 -o video.avi -oac copy -ovc copy", events={TIMEOUT:print_ticks}, timeout=5)
+
+ The 'events' argument should be a dictionary of patterns and responses.
+ Whenever one of the patterns is seen in the command out run() will send the
+ associated response string. Note that you should put newlines in your
+ string if Enter is necessary. The responses may also contain callback
+ functions. Any callback is function that takes a dictionary as an argument.
+ The dictionary contains all the locals from the run() function, so you can
+ access the child spawn object or any other variable defined in run()
+ (event_count, child, and extra_args are the most useful). A callback may
+ return True to stop the current run process otherwise run() continues until
+ the next event. A callback may also return a string which will be sent to
+ the child. 'extra_args' is not used by directly run(). It provides a way to
+ pass data to a callback function through run() through the locals
+ dictionary passed to a callback."""
+
+ if timeout == -1:
+ child = spawn(command, maxread=2000, logfile=logfile, cwd=cwd, env=env,
+ encoding=encoding)
+ else:
+ child = spawn(command, timeout=timeout, maxread=2000, logfile=logfile,
+ cwd=cwd, env=env, encoding=encoding)
+ if events is not None:
+ patterns = list(events.keys())
+ responses = list(events.values())
+ else:
+ patterns=None # We assume that EOF or TIMEOUT will save us.
+ responses=None
+ child_result_list = []
+ event_count = 0
+ while 1:
+ try:
+ index = child.expect (patterns)
+ if isinstance(child.after, str):
+ child_result_list.append(child.before + child.after)
+ else: # child.after may have been a TIMEOUT or EOF, so don't cat those.
+ child_result_list.append(child.before)
+ if isinstance(responses[index], str):
+ child.send(responses[index])
+ elif type(responses[index]) is types.FunctionType:
+ callback_result = responses[index](locals())
+ sys.stdout.flush()
+ if isinstance(callback_result, str):
+ child.send(callback_result)
+ elif callback_result:
+ break
+ else:
+ raise TypeError ('The callback must be a string or function type.')
+ event_count = event_count + 1
+ except TIMEOUT as e:
+ child_result_list.append(child.before)
+ break
+ except EOF as e:
+ child_result_list.append(child.before)
+ break
+ child_result = child._empty_buffer.join(child_result_list)
+ if withexitstatus:
+ child.close()
+ return (child_result, child.exitstatus)
+ else:
+ return child_result
+
+class spawnb(object):
+ """Use this class to start and control child applications with a pure-bytes
+ interface."""
+
+ _buffer_type = bytes
+ def _cast_buffer_type(self, s):
+ return _cast_bytes(s, self.encoding)
+ _empty_buffer = b''
+ _pty_newline = b'\r\n'
+
+ # Some code needs this to exist, but it's mainly for the spawn subclass.
+ encoding = 'utf-8'
+
+ def __init__(self, command, args=[], timeout=30, maxread=2000, searchwindowsize=None,
+ logfile=None, cwd=None, env=None):
+
+ """This is the constructor. The command parameter may be a string that
+ includes a command and any arguments to the command. For example::
+
+ child = pexpect.spawn ('/usr/bin/ftp')
+ child = pexpect.spawn ('/usr/bin/ssh user@example.com')
+ child = pexpect.spawn ('ls -latr /tmp')
+
+ You may also construct it with a list of arguments like so::
+
+ child = pexpect.spawn ('/usr/bin/ftp', [])
+ child = pexpect.spawn ('/usr/bin/ssh', ['user@example.com'])
+ child = pexpect.spawn ('ls', ['-latr', '/tmp'])
+
+ After this the child application will be created and will be ready to
+ talk to. For normal use, see expect() and send() and sendline().
+
+ Remember that Pexpect does NOT interpret shell meta characters such as
+ redirect, pipe, or wild cards (>, |, or *). This is a common mistake.
+ If you want to run a command and pipe it through another command then
+ you must also start a shell. For example::
+
+ child = pexpect.spawn('/bin/bash -c "ls -l | grep LOG > log_list.txt"')
+ child.expect(pexpect.EOF)
+
+ The second form of spawn (where you pass a list of arguments) is useful
+ in situations where you wish to spawn a command and pass it its own
+ argument list. This can make syntax more clear. For example, the
+ following is equivalent to the previous example::
+
+ shell_cmd = 'ls -l | grep LOG > log_list.txt'
+ child = pexpect.spawn('/bin/bash', ['-c', shell_cmd])
+ child.expect(pexpect.EOF)
+
+ The maxread attribute sets the read buffer size. This is maximum number
+ of bytes that Pexpect will try to read from a TTY at one time. Setting
+ the maxread size to 1 will turn off buffering. Setting the maxread
+ value higher may help performance in cases where large amounts of
+ output are read back from the child. This feature is useful in
+ conjunction with searchwindowsize.
+
+ The searchwindowsize attribute sets the how far back in the incomming
+ seach buffer Pexpect will search for pattern matches. Every time
+ Pexpect reads some data from the child it will append the data to the
+ incomming buffer. The default is to search from the beginning of the
+ imcomming buffer each time new data is read from the child. But this is
+ very inefficient if you are running a command that generates a large
+ amount of data where you want to match The searchwindowsize does not
+ effect the size of the incomming data buffer. You will still have
+ access to the full buffer after expect() returns.
+
+ The logfile member turns on or off logging. All input and output will
+ be copied to the given file object. Set logfile to None to stop
+ logging. This is the default. Set logfile to sys.stdout to echo
+ everything to standard output. The logfile is flushed after each write.
+
+ Example log input and output to a file::
+
+ child = pexpect.spawn('some_command')
+ fout = file('mylog.txt','w')
+ child.logfile = fout
+
+ Example log to stdout::
+
+ child = pexpect.spawn('some_command')
+ child.logfile = sys.stdout
+
+ The logfile_read and logfile_send members can be used to separately log
+ the input from the child and output sent to the child. Sometimes you
+ don't want to see everything you write to the child. You only want to
+ log what the child sends back. For example::
+
+ child = pexpect.spawn('some_command')
+ child.logfile_read = sys.stdout
+
+ To separately log output sent to the child use logfile_send::
+
+ self.logfile_send = fout
+
+ The delaybeforesend helps overcome a weird behavior that many users
+ were experiencing. The typical problem was that a user would expect() a
+ "Password:" prompt and then immediately call sendline() to send the
+ password. The user would then see that their password was echoed back
+ to them. Passwords don't normally echo. The problem is caused by the
+ fact that most applications print out the "Password" prompt and then
+ turn off stdin echo, but if you send your password before the
+ application turned off echo, then you get your password echoed.
+ Normally this wouldn't be a problem when interacting with a human at a
+ real keyboard. If you introduce a slight delay just before writing then
+ this seems to clear up the problem. This was such a common problem for
+ many users that I decided that the default pexpect behavior should be
+ to sleep just before writing to the child application. 1/20th of a
+ second (50 ms) seems to be enough to clear up the problem. You can set
+ delaybeforesend to 0 to return to the old behavior. Most Linux machines
+ don't like this to be below 0.03. I don't know why.
+
+ Note that spawn is clever about finding commands on your path.
+ It uses the same logic that "which" uses to find executables.
+
+ If you wish to get the exit status of the child you must call the
+ close() method. The exit or signal status of the child will be stored
+ in self.exitstatus or self.signalstatus. If the child exited normally
+ then exitstatus will store the exit return code and signalstatus will
+ be None. If the child was terminated abnormally with a signal then
+ signalstatus will store the signal value and exitstatus will be None.
+ If you need more detail you can also read the self.status member which
+ stores the status returned by os.waitpid. You can interpret this using
+ os.WIFEXITED/os.WEXITSTATUS or os.WIFSIGNALED/os.TERMSIG. """
+
+ self.STDIN_FILENO = pty.STDIN_FILENO
+ self.STDOUT_FILENO = pty.STDOUT_FILENO
+ self.STDERR_FILENO = pty.STDERR_FILENO
+ self.stdin = sys.stdin
+ self.stdout = sys.stdout
+ self.stderr = sys.stderr
+
+ self.searcher = None
+ self.ignorecase = False
+ self.before = None
+ self.after = None
+ self.match = None
+ self.match_index = None
+ self.terminated = True
+ self.exitstatus = None
+ self.signalstatus = None
+ self.status = None # status returned by os.waitpid
+ self.flag_eof = False
+ self.pid = None
+ self.child_fd = -1 # initially closed
+ self.timeout = timeout
+ self.delimiter = EOF
+ self.logfile = logfile
+ self.logfile_read = None # input from child (read_nonblocking)
+ self.logfile_send = None # output to send (send, sendline)
+ self.maxread = maxread # max bytes to read at one time into buffer
+ self.buffer = self._empty_buffer # This is the read buffer. See maxread.
+ self.searchwindowsize = searchwindowsize # Anything before searchwindowsize point is preserved, but not searched.
+ # Most Linux machines don't like delaybeforesend to be below 0.03 (30 ms).
+ self.delaybeforesend = 0.05 # Sets sleep time used just before sending data to child. Time in seconds.
+ self.delayafterclose = 0.1 # Sets delay in close() method to allow kernel time to update process status. Time in seconds.
+ self.delayafterterminate = 0.1 # Sets delay in terminate() method to allow kernel time to update process status. Time in seconds.
+ self.softspace = False # File-like object.
+ self.name = '<' + repr(self) + '>' # File-like object.
+ self.closed = True # File-like object.
+ self.cwd = cwd
+ self.env = env
+ self.__irix_hack = (sys.platform.lower().find('irix')>=0) # This flags if we are running on irix
+ # Solaris uses internal __fork_pty(). All others use pty.fork().
+ if 'solaris' in sys.platform.lower() or 'sunos5' in sys.platform.lower():
+ self.use_native_pty_fork = False
+ else:
+ self.use_native_pty_fork = True
+
+
+ # allow dummy instances for subclasses that may not use command or args.
+ if command is None:
+ self.command = None
+ self.args = None
+ self.name = ''
+ else:
+ self._spawn (command, args)
+
+ def __del__(self):
+
+ """This makes sure that no system resources are left open. Python only
+ garbage collects Python objects. OS file descriptors are not Python
+ objects, so they must be handled explicitly. If the child file
+ descriptor was opened outside of this class (passed to the constructor)
+ then this does not close it. """
+
+ if not self.closed:
+ # It is possible for __del__ methods to execute during the
+ # teardown of the Python VM itself. Thus self.close() may
+ # trigger an exception because os.close may be None.
+ # -- Fernando Perez
+ try:
+ self.close()
+ except:
+ pass
+
+ def __str__(self):
+
+ """This returns a human-readable string that represents the state of
+ the object. """
+
+ s = []
+ s.append(repr(self))
+ s.append('version: ' + __version__)
+ s.append('command: ' + str(self.command))
+ s.append('args: ' + str(self.args))
+ s.append('searcher: ' + str(self.searcher))
+ s.append('buffer (last 100 chars): ' + str(self.buffer)[-100:])
+ s.append('before (last 100 chars): ' + str(self.before)[-100:])
+ s.append('after: ' + str(self.after))
+ s.append('match: ' + str(self.match))
+ s.append('match_index: ' + str(self.match_index))
+ s.append('exitstatus: ' + str(self.exitstatus))
+ s.append('flag_eof: ' + str(self.flag_eof))
+ s.append('pid: ' + str(self.pid))
+ s.append('child_fd: ' + str(self.child_fd))
+ s.append('closed: ' + str(self.closed))
+ s.append('timeout: ' + str(self.timeout))
+ s.append('delimiter: ' + str(self.delimiter))
+ s.append('logfile: ' + str(self.logfile))
+ s.append('logfile_read: ' + str(self.logfile_read))
+ s.append('logfile_send: ' + str(self.logfile_send))
+ s.append('maxread: ' + str(self.maxread))
+ s.append('ignorecase: ' + str(self.ignorecase))
+ s.append('searchwindowsize: ' + str(self.searchwindowsize))
+ s.append('delaybeforesend: ' + str(self.delaybeforesend))
+ s.append('delayafterclose: ' + str(self.delayafterclose))
+ s.append('delayafterterminate: ' + str(self.delayafterterminate))
+ return '\n'.join(s)
+
+ def _spawn(self,command,args=[]):
+
+ """This starts the given command in a child process. This does all the
+ fork/exec type of stuff for a pty. This is called by __init__. If args
+ is empty then command will be parsed (split on spaces) and args will be
+ set to parsed arguments. """
+
+ # The pid and child_fd of this object get set by this method.
+ # Note that it is difficult for this method to fail.
+ # You cannot detect if the child process cannot start.
+ # So the only way you can tell if the child process started
+ # or not is to try to read from the file descriptor. If you get
+ # EOF immediately then it means that the child is already dead.
+ # That may not necessarily be bad because you may haved spawned a child
+ # that performs some task; creates no stdout output; and then dies.
+
+ # If command is an int type then it may represent a file descriptor.
+ if type(command) == type(0):
+ raise ExceptionPexpect ('Command is an int type. If this is a file descriptor then maybe you want to use fdpexpect.fdspawn which takes an existing file descriptor instead of a command string.')
+
+ if type (args) != type([]):
+ raise TypeError ('The argument, args, must be a list.')
+
+ if args == []:
+ self.args = split_command_line(command)
+ self.command = self.args[0]
+ else:
+ self.args = args[:] # work with a copy
+ self.args.insert (0, command)
+ self.command = command
+
+ command_with_path = which(self.command)
+ if command_with_path is None:
+ raise ExceptionPexpect ('The command was not found or was not executable: %s.' % self.command)
+ self.command = command_with_path
+ self.args[0] = self.command
+
+ self.name = '<' + ' '.join (self.args) + '>'
+
+ assert self.pid is None, 'The pid member should be None.'
+ assert self.command is not None, 'The command member should not be None.'
+
+ if self.use_native_pty_fork:
+ try:
+ self.pid, self.child_fd = pty.fork()
+ except OSError as e:
+ raise ExceptionPexpect('Error! pty.fork() failed: ' + str(e))
+ else: # Use internal __fork_pty
+ self.pid, self.child_fd = self.__fork_pty()
+
+ if self.pid == 0: # Child
+ try:
+ self.child_fd = sys.stdout.fileno() # used by setwinsize()
+ self.setwinsize(24, 80)
+ except:
+ # Some platforms do not like setwinsize (Cygwin).
+ # This will cause problem when running applications that
+ # are very picky about window size.
+ # This is a serious limitation, but not a show stopper.
+ pass
+ # Do not allow child to inherit open file descriptors from parent.
+ max_fd = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
+ for i in range (3, max_fd):
+ try:
+ os.close (i)
+ except OSError:
+ pass
+
+ # I don't know why this works, but ignoring SIGHUP fixes a
+ # problem when trying to start a Java daemon with sudo
+ # (specifically, Tomcat).
+ signal.signal(signal.SIGHUP, signal.SIG_IGN)
+
+ if self.cwd is not None:
+ os.chdir(self.cwd)
+ if self.env is None:
+ os.execv(self.command, self.args)
+ else:
+ os.execvpe(self.command, self.args, self.env)
+
+ # Parent
+ self.terminated = False
+ self.closed = False
+
+ def __fork_pty(self):
+
+ """This implements a substitute for the forkpty system call. This
+ should be more portable than the pty.fork() function. Specifically,
+ this should work on Solaris.
+
+ Modified 10.06.05 by Geoff Marshall: Implemented __fork_pty() method to
+ resolve the issue with Python's pty.fork() not supporting Solaris,
+ particularly ssh. Based on patch to posixmodule.c authored by Noah
+ Spurrier::
+
+ http://mail.python.org/pipermail/python-dev/2003-May/035281.html
+
+ """
+
+ parent_fd, child_fd = os.openpty()
+ if parent_fd < 0 or child_fd < 0:
+ raise ExceptionPexpect("Error! Could not open pty with os.openpty().")
+
+ pid = os.fork()
+ if pid < 0:
+ raise ExceptionPexpect("Error! Failed os.fork().")
+ elif pid == 0:
+ # Child.
+ os.close(parent_fd)
+ self.__pty_make_controlling_tty(child_fd)
+
+ os.dup2(child_fd, 0)
+ os.dup2(child_fd, 1)
+ os.dup2(child_fd, 2)
+
+ if child_fd > 2:
+ os.close(child_fd)
+ else:
+ # Parent.
+ os.close(child_fd)
+
+ return pid, parent_fd
+
+ def __pty_make_controlling_tty(self, tty_fd):
+
+ """This makes the pseudo-terminal the controlling tty. This should be
+ more portable than the pty.fork() function. Specifically, this should
+ work on Solaris. """
+
+ child_name = os.ttyname(tty_fd)
+
+ # Disconnect from controlling tty. Harmless if not already connected.
+ try:
+ fd = os.open("/dev/tty", os.O_RDWR | os.O_NOCTTY);
+ if fd >= 0:
+ os.close(fd)
+ except:
+ # Already disconnected. This happens if running inside cron.
+ pass
+
+ os.setsid()
+
+ # Verify we are disconnected from controlling tty
+ # by attempting to open it again.
+ try:
+ fd = os.open("/dev/tty", os.O_RDWR | os.O_NOCTTY);
+ if fd >= 0:
+ os.close(fd)
+ raise ExceptionPexpect("Error! Failed to disconnect from controlling tty. It is still possible to open /dev/tty.")
+ except:
+ # Good! We are disconnected from a controlling tty.
+ pass
+
+ # Verify we can open child pty.
+ fd = os.open(child_name, os.O_RDWR);
+ if fd < 0:
+ raise ExceptionPexpect("Error! Could not open child pty, " + child_name)
+ else:
+ os.close(fd)
+
+ # Verify we now have a controlling tty.
+ fd = os.open("/dev/tty", os.O_WRONLY)
+ if fd < 0:
+ raise ExceptionPexpect("Error! Could not open controlling tty, /dev/tty")
+ else:
+ os.close(fd)
+
+ def fileno (self): # File-like object.
+
+ """This returns the file descriptor of the pty for the child.
+ """
+
+ return self.child_fd
+
+ def close (self, force=True): # File-like object.
+
+ """This closes the connection with the child application. Note that
+ calling close() more than once is valid. This emulates standard Python
+ behavior with files. Set force to True if you want to make sure that
+ the child is terminated (SIGKILL is sent if the child ignores SIGHUP
+ and SIGINT). """
+
+ if not self.closed:
+ self.flush()
+ os.close (self.child_fd)
+ time.sleep(self.delayafterclose) # Give kernel time to update process status.
+ if self.isalive():
+ if not self.terminate(force):
+ raise ExceptionPexpect ('close() could not terminate the child using terminate()')
+ self.child_fd = -1
+ self.closed = True
+ #self.pid = None
+
+ def flush (self): # File-like object.
+
+ """This does nothing. It is here to support the interface for a
+ File-like object. """
+
+ pass
+
+ def isatty (self): # File-like object.
+
+ """This returns True if the file descriptor is open and connected to a
+ tty(-like) device, else False. """
+
+ return os.isatty(self.child_fd)
+
+ def waitnoecho (self, timeout=-1):
+
+ """This waits until the terminal ECHO flag is set False. This returns
+ True if the echo mode is off. This returns False if the ECHO flag was
+ not set False before the timeout. This can be used to detect when the
+ child is waiting for a password. Usually a child application will turn
+ off echo mode when it is waiting for the user to enter a password. For
+ example, instead of expecting the "password:" prompt you can wait for
+ the child to set ECHO off::
+
+ p = pexpect.spawn ('ssh user@example.com')
+ p.waitnoecho()
+ p.sendline(mypassword)
+
+ If timeout==-1 then this method will use the value in self.timeout.
+ If timeout==None then this method to block until ECHO flag is False.
+ """
+
+ if timeout == -1:
+ timeout = self.timeout
+ if timeout is not None:
+ end_time = time.time() + timeout
+ while True:
+ if not self.getecho():
+ return True
+ if timeout < 0 and timeout is not None:
+ return False
+ if timeout is not None:
+ timeout = end_time - time.time()
+ time.sleep(0.1)
+
+ def getecho (self):
+
+ """This returns the terminal echo mode. This returns True if echo is
+ on or False if echo is off. Child applications that are expecting you
+ to enter a password often set ECHO False. See waitnoecho(). """
+
+ attr = termios.tcgetattr(self.child_fd)
+ if attr[3] & termios.ECHO:
+ return True
+ return False
+
+ def setecho (self, state):
+
+ """This sets the terminal echo mode on or off. Note that anything the
+ child sent before the echo will be lost, so you should be sure that
+ your input buffer is empty before you call setecho(). For example, the
+ following will work as expected::
+
+ p = pexpect.spawn('cat')
+ p.sendline ('1234') # We will see this twice (once from tty echo and again from cat).
+ p.expect (['1234'])
+ p.expect (['1234'])
+ p.setecho(False) # Turn off tty echo
+ p.sendline ('abcd') # We will set this only once (echoed by cat).
+ p.sendline ('wxyz') # We will set this only once (echoed by cat)
+ p.expect (['abcd'])
+ p.expect (['wxyz'])
+
+ The following WILL NOT WORK because the lines sent before the setecho
+ will be lost::
+
+ p = pexpect.spawn('cat')
+ p.sendline ('1234') # We will see this twice (once from tty echo and again from cat).
+ p.setecho(False) # Turn off tty echo
+ p.sendline ('abcd') # We will set this only once (echoed by cat).
+ p.sendline ('wxyz') # We will set this only once (echoed by cat)
+ p.expect (['1234'])
+ p.expect (['1234'])
+ p.expect (['abcd'])
+ p.expect (['wxyz'])
+ """
+
+ self.child_fd
+ attr = termios.tcgetattr(self.child_fd)
+ if state:
+ attr[3] = attr[3] | termios.ECHO
+ else:
+ attr[3] = attr[3] & ~termios.ECHO
+ # I tried TCSADRAIN and TCSAFLUSH, but these were inconsistent
+ # and blocked on some platforms. TCSADRAIN is probably ideal if it worked.
+ termios.tcsetattr(self.child_fd, termios.TCSANOW, attr)
+
+ def read_nonblocking (self, size = 1, timeout = -1):
+
+ """This reads at most size bytes from the child application. It
+ includes a timeout. If the read does not complete within the timeout
+ period then a TIMEOUT exception is raised. If the end of file is read
+ then an EOF exception will be raised. If a log file was set using
+ setlog() then all data will also be written to the log file.
+
+ If timeout is None then the read may block indefinitely. If timeout is -1
+ then the self.timeout value is used. If timeout is 0 then the child is
+ polled and if there was no data immediately ready then this will raise
+ a TIMEOUT exception.
+
+ The timeout refers only to the amount of time to read at least one
+ character. This is not effected by the 'size' parameter, so if you call
+ read_nonblocking(size=100, timeout=30) and only one character is
+ available right away then one character will be returned immediately.
+ It will not wait for 30 seconds for another 99 characters to come in.
+
+ This is a wrapper around os.read(). It uses select.select() to
+ implement the timeout. """
+
+ if self.closed:
+ raise ValueError ('I/O operation on closed file in read_nonblocking().')
+
+ if timeout == -1:
+ timeout = self.timeout
+
+ # Note that some systems such as Solaris do not give an EOF when
+ # the child dies. In fact, you can still try to read
+ # from the child_fd -- it will block forever or until TIMEOUT.
+ # For this case, I test isalive() before doing any reading.
+ # If isalive() is false, then I pretend that this is the same as EOF.
+ if not self.isalive():
+ r,w,e = self.__select([self.child_fd], [], [], 0) # timeout of 0 means "poll"
+ if not r:
+ self.flag_eof = True
+ raise EOF ('End Of File (EOF) in read_nonblocking(). Braindead platform.')
+ elif self.__irix_hack:
+ # This is a hack for Irix. It seems that Irix requires a long delay before checking isalive.
+ # This adds a 2 second delay, but only when the child is terminated.
+ r, w, e = self.__select([self.child_fd], [], [], 2)
+ if not r and not self.isalive():
+ self.flag_eof = True
+ raise EOF ('End Of File (EOF) in read_nonblocking(). Pokey platform.')
+
+ r,w,e = self.__select([self.child_fd], [], [], timeout)
+
+ if not r:
+ if not self.isalive():
+ # Some platforms, such as Irix, will claim that their processes are alive;
+ # then timeout on the select; and then finally admit that they are not alive.
+ self.flag_eof = True
+ raise EOF ('End of File (EOF) in read_nonblocking(). Very pokey platform.')
+ else:
+ raise TIMEOUT ('Timeout exceeded in read_nonblocking().')
+
+ if self.child_fd in r:
+ try:
+ s = os.read(self.child_fd, size)
+ except OSError as e: # Linux does this
+ self.flag_eof = True
+ raise EOF ('End Of File (EOF) in read_nonblocking(). Exception style platform.')
+ if s == b'': # BSD style
+ self.flag_eof = True
+ raise EOF ('End Of File (EOF) in read_nonblocking(). Empty string style platform.')
+
+ s2 = self._cast_buffer_type(s)
+ if self.logfile is not None:
+ self.logfile.write(s2)
+ self.logfile.flush()
+ if self.logfile_read is not None:
+ self.logfile_read.write(s2)
+ self.logfile_read.flush()
+
+ return s
+
+ raise ExceptionPexpect ('Reached an unexpected state in read_nonblocking().')
+
+ def read (self, size = -1): # File-like object.
+ """This reads at most "size" bytes from the file (less if the read hits
+ EOF before obtaining size bytes). If the size argument is negative or
+ omitted, read all data until EOF is reached. The bytes are returned as
+ a string object. An empty string is returned when EOF is encountered
+ immediately. """
+
+ if size == 0:
+ return self._empty_buffer
+ if size < 0:
+ self.expect (self.delimiter) # delimiter default is EOF
+ return self.before
+
+ # I could have done this more directly by not using expect(), but
+ # I deliberately decided to couple read() to expect() so that
+ # I would catch any bugs early and ensure consistant behavior.
+ # It's a little less efficient, but there is less for me to
+ # worry about if I have to later modify read() or expect().
+ # Note, it's OK if size==-1 in the regex. That just means it
+ # will never match anything in which case we stop only on EOF.
+ if self._buffer_type is bytes:
+ pat = ('.{%d}' % size).encode('ascii')
+ else:
+ pat = '.{%d}' % size
+ cre = re.compile(pat, re.DOTALL)
+ index = self.expect ([cre, self.delimiter]) # delimiter default is EOF
+ if index == 0:
+ return self.after ### self.before should be ''. Should I assert this?
+ return self.before
+
+ def readline(self, size = -1):
+ """This reads and returns one entire line. A trailing newline is kept
+ in the string, but may be absent when a file ends with an incomplete
+ line. Note: This readline() looks for a \\r\\n pair even on UNIX
+ because this is what the pseudo tty device returns. So contrary to what
+ you may expect you will receive the newline as \\r\\n. An empty string
+ is returned when EOF is hit immediately. Currently, the size argument is
+ mostly ignored, so this behavior is not standard for a file-like
+ object. If size is 0 then an empty string is returned. """
+
+ if size == 0:
+ return self._empty_buffer
+ index = self.expect ([self._pty_newline, self.delimiter]) # delimiter default is EOF
+ if index == 0:
+ return self.before + self._pty_newline
+ return self.before
+
+ def __iter__ (self): # File-like object.
+
+ """This is to support iterators over a file-like object.
+ """
+
+ return self
+
+ def __next__ (self): # File-like object.
+
+ """This is to support iterators over a file-like object.
+ """
+
+ result = self.readline()
+ if result == self._empty_buffer:
+ raise StopIteration
+ return result
+
+ def readlines (self, sizehint = -1): # File-like object.
+
+ """This reads until EOF using readline() and returns a list containing
+ the lines thus read. The optional "sizehint" argument is ignored. """
+
+ lines = []
+ while True:
+ line = self.readline()
+ if not line:
+ break
+ lines.append(line)
+ return lines
+
+ def write(self, s): # File-like object.
+
+ """This is similar to send() except that there is no return value.
+ """
+
+ self.send (s)
+
+ def writelines (self, sequence): # File-like object.
+
+ """This calls write() for each element in the sequence. The sequence
+ can be any iterable object producing strings, typically a list of
+ strings. This does not add line separators There is no return value.
+ """
+
+ for s in sequence:
+ self.write (s)
+
+ def send(self, s):
+
+ """This sends a string to the child process. This returns the number of
+ bytes written. If a log file was set then the data is also written to
+ the log. """
+
+ time.sleep(self.delaybeforesend)
+
+ s2 = self._cast_buffer_type(s)
+ if self.logfile is not None:
+ self.logfile.write(s2)
+ self.logfile.flush()
+ if self.logfile_send is not None:
+ self.logfile_send.write(s2)
+ self.logfile_send.flush()
+ c = os.write (self.child_fd, _cast_bytes(s, self.encoding))
+ return c
+
+ def sendline(self, s=''):
+
+ """This is like send(), but it adds a line feed (os.linesep). This
+ returns the number of bytes written. """
+
+ n = self.send (s)
+ n = n + self.send (os.linesep)
+ return n
+
+ def sendcontrol(self, char):
+
+ """This sends a control character to the child such as Ctrl-C or
+ Ctrl-D. For example, to send a Ctrl-G (ASCII 7)::
+
+ child.sendcontrol('g')
+
+ See also, sendintr() and sendeof().
+ """
+
+ char = char.lower()
+ a = ord(char)
+ if a>=97 and a<=122:
+ a = a - ord('a') + 1
+ return self.send (chr(a))
+ d = {'@':0, '`':0,
+ '[':27, '{':27,
+ '\\':28, '|':28,
+ ']':29, '}': 29,
+ '^':30, '~':30,
+ '_':31,
+ '?':127}
+ if char not in d:
+ return 0
+ return self.send (chr(d[char]))
+
+ def sendeof(self):
+
+ """This sends an EOF to the child. This sends a character which causes
+ the pending parent output buffer to be sent to the waiting child
+ program without waiting for end-of-line. If it is the first character
+ of the line, the read() in the user program returns 0, which signifies
+ end-of-file. This means to work as expected a sendeof() has to be
+ called at the beginning of a line. This method does not send a newline.
+ It is the responsibility of the caller to ensure the eof is sent at the
+ beginning of a line. """
+
+ ### Hmmm... how do I send an EOF?
+ ###C if ((m = write(pty, *buf, p - *buf)) < 0)
+ ###C return (errno == EWOULDBLOCK) ? n : -1;
+ #fd = sys.stdin.fileno()
+ #old = termios.tcgetattr(fd) # remember current state
+ #attr = termios.tcgetattr(fd)
+ #attr[3] = attr[3] | termios.ICANON # ICANON must be set to recognize EOF
+ #try: # use try/finally to ensure state gets restored
+ # termios.tcsetattr(fd, termios.TCSADRAIN, attr)
+ # if hasattr(termios, 'CEOF'):
+ # os.write (self.child_fd, '%c' % termios.CEOF)
+ # else:
+ # # Silly platform does not define CEOF so assume CTRL-D
+ # os.write (self.child_fd, '%c' % 4)
+ #finally: # restore state
+ # termios.tcsetattr(fd, termios.TCSADRAIN, old)
+ if hasattr(termios, 'VEOF'):
+ char = termios.tcgetattr(self.child_fd)[6][termios.VEOF]
+ else:
+ # platform does not define VEOF so assume CTRL-D
+ char = chr(4)
+ self.send(char)
+
+ def sendintr(self):
+
+ """This sends a SIGINT to the child. It does not require
+ the SIGINT to be the first character on a line. """
+
+ if hasattr(termios, 'VINTR'):
+ char = termios.tcgetattr(self.child_fd)[6][termios.VINTR]
+ else:
+ # platform does not define VINTR so assume CTRL-C
+ char = chr(3)
+ self.send (char)
+
+ def eof (self):
+
+ """This returns True if the EOF exception was ever raised.
+ """
+
+ return self.flag_eof
+
+ def terminate(self, force=False):
+
+ """This forces a child process to terminate. It starts nicely with
+ SIGHUP and SIGINT. If "force" is True then moves onto SIGKILL. This
+ returns True if the child was terminated. This returns False if the
+ child could not be terminated. """
+
+ if not self.isalive():
+ return True
+ try:
+ self.kill(signal.SIGHUP)
+ time.sleep(self.delayafterterminate)
+ if not self.isalive():
+ return True
+ self.kill(signal.SIGCONT)
+ time.sleep(self.delayafterterminate)
+ if not self.isalive():
+ return True
+ self.kill(signal.SIGINT)
+ time.sleep(self.delayafterterminate)
+ if not self.isalive():
+ return True
+ if force:
+ self.kill(signal.SIGKILL)
+ time.sleep(self.delayafterterminate)
+ if not self.isalive():
+ return True
+ else:
+ return False
+ return False
+ except OSError as e:
+ # I think there are kernel timing issues that sometimes cause
+ # this to happen. I think isalive() reports True, but the
+ # process is dead to the kernel.
+ # Make one last attempt to see if the kernel is up to date.
+ time.sleep(self.delayafterterminate)
+ if not self.isalive():
+ return True
+ else:
+ return False
+
+ def wait(self):
+
+ """This waits until the child exits. This is a blocking call. This will
+ not read any data from the child, so this will block forever if the
+ child has unread output and has terminated. In other words, the child
+ may have printed output then called exit(); but, technically, the child
+ is still alive until its output is read. """
+
+ if self.isalive():
+ pid, status = os.waitpid(self.pid, 0)
+ else:
+ raise ExceptionPexpect ('Cannot wait for dead child process.')
+ self.exitstatus = os.WEXITSTATUS(status)
+ if os.WIFEXITED (status):
+ self.status = status
+ self.exitstatus = os.WEXITSTATUS(status)
+ self.signalstatus = None
+ self.terminated = True
+ elif os.WIFSIGNALED (status):
+ self.status = status
+ self.exitstatus = None
+ self.signalstatus = os.WTERMSIG(status)
+ self.terminated = True
+ elif os.WIFSTOPPED (status):
+ raise ExceptionPexpect ('Wait was called for a child process that is stopped. This is not supported. Is some other process attempting job control with our child pid?')
+ return self.exitstatus
+
+ def isalive(self):
+
+ """This tests if the child process is running or not. This is
+ non-blocking. If the child was terminated then this will read the
+ exitstatus or signalstatus of the child. This returns True if the child
+ process appears to be running or False if not. It can take literally
+ SECONDS for Solaris to return the right status. """
+
+ if self.terminated:
+ return False
+
+ if self.flag_eof:
+ # This is for Linux, which requires the blocking form of waitpid to get
+ # status of a defunct process. This is super-lame. The flag_eof would have
+ # been set in read_nonblocking(), so this should be safe.
+ waitpid_options = 0
+ else:
+ waitpid_options = os.WNOHANG
+
+ try:
+ pid, status = os.waitpid(self.pid, waitpid_options)
+ except OSError as e: # No child processes
+ if e.errno == errno.ECHILD:
+ raise ExceptionPexpect ('isalive() encountered condition where "terminated" is 0, but there was no child process. Did someone else call waitpid() on our process?')
+ else:
+ raise e
+
+ # I have to do this twice for Solaris. I can't even believe that I figured this out...
+ # If waitpid() returns 0 it means that no child process wishes to
+ # report, and the value of status is undefined.
+ if pid == 0:
+ try:
+ pid, status = os.waitpid(self.pid, waitpid_options) ### os.WNOHANG) # Solaris!
+ except OSError as e: # This should never happen...
+ if e[0] == errno.ECHILD:
+ raise ExceptionPexpect ('isalive() encountered condition that should never happen. There was no child process. Did someone else call waitpid() on our process?')
+ else:
+ raise e
+
+ # If pid is still 0 after two calls to waitpid() then
+ # the process really is alive. This seems to work on all platforms, except
+ # for Irix which seems to require a blocking call on waitpid or select, so I let read_nonblocking
+ # take care of this situation (unfortunately, this requires waiting through the timeout).
+ if pid == 0:
+ return True
+
+ if pid == 0:
+ return True
+
+ if os.WIFEXITED (status):
+ self.status = status
+ self.exitstatus = os.WEXITSTATUS(status)
+ self.signalstatus = None
+ self.terminated = True
+ elif os.WIFSIGNALED (status):
+ self.status = status
+ self.exitstatus = None
+ self.signalstatus = os.WTERMSIG(status)
+ self.terminated = True
+ elif os.WIFSTOPPED (status):
+ raise ExceptionPexpect ('isalive() encountered condition where child process is stopped. This is not supported. Is some other process attempting job control with our child pid?')
+ return False
+
+ def kill(self, sig):
+
+ """This sends the given signal to the child application. In keeping
+ with UNIX tradition it has a misleading name. It does not necessarily
+ kill the child unless you send the right signal. """
+
+ # Same as os.kill, but the pid is given for you.
+ if self.isalive():
+ os.kill(self.pid, sig)
+
+ def compile_pattern_list(self, patterns):
+
+ """This compiles a pattern-string or a list of pattern-strings.
+ Patterns must be a StringType, EOF, TIMEOUT, SRE_Pattern, or a list of
+ those. Patterns may also be None which results in an empty list (you
+ might do this if waiting for an EOF or TIMEOUT condition without
+ expecting any pattern).
+
+ This is used by expect() when calling expect_list(). Thus expect() is
+ nothing more than::
+
+ cpl = self.compile_pattern_list(pl)
+ return self.expect_list(cpl, timeout)
+
+ If you are using expect() within a loop it may be more
+ efficient to compile the patterns first and then call expect_list().
+ This avoid calls in a loop to compile_pattern_list()::
+
+ cpl = self.compile_pattern_list(my_pattern)
+ while some_condition:
+ ...
+ i = self.expect_list(clp, timeout)
+ ...
+ """
+
+ if patterns is None:
+ return []
+ if not isinstance(patterns, list):
+ patterns = [patterns]
+
+ compile_flags = re.DOTALL # Allow dot to match \n
+ if self.ignorecase:
+ compile_flags = compile_flags | re.IGNORECASE
+ compiled_pattern_list = []
+ for p in patterns:
+ if isinstance(p, (bytes, str)):
+ p = self._cast_buffer_type(p)
+ compiled_pattern_list.append(re.compile(p, compile_flags))
+ elif p is EOF:
+ compiled_pattern_list.append(EOF)
+ elif p is TIMEOUT:
+ compiled_pattern_list.append(TIMEOUT)
+ elif type(p) is re_type:
+ p = self._prepare_regex_pattern(p)
+ compiled_pattern_list.append(p)
+ else:
+ raise TypeError ('Argument must be one of StringTypes, EOF, TIMEOUT, SRE_Pattern, or a list of those type. %s' % str(type(p)))
+
+ return compiled_pattern_list
+
+ def _prepare_regex_pattern(self, p):
+ "Recompile unicode regexes as bytes regexes. Overridden in subclass."
+ if isinstance(p.pattern, str):
+ p = re.compile(p.pattern.encode('utf-8'), p.flags &~ re.UNICODE)
+ return p
+
+ def expect(self, pattern, timeout = -1, searchwindowsize=-1):
+
+ """This seeks through the stream until a pattern is matched. The
+ pattern is overloaded and may take several types. The pattern can be a
+ StringType, EOF, a compiled re, or a list of any of those types.
+ Strings will be compiled to re types. This returns the index into the
+ pattern list. If the pattern was not a list this returns index 0 on a
+ successful match. This may raise exceptions for EOF or TIMEOUT. To
+ avoid the EOF or TIMEOUT exceptions add EOF or TIMEOUT to the pattern
+ list. That will cause expect to match an EOF or TIMEOUT condition
+ instead of raising an exception.
+
+ If you pass a list of patterns and more than one matches, the first match
+ in the stream is chosen. If more than one pattern matches at that point,
+ the leftmost in the pattern list is chosen. For example::
+
+ # the input is 'foobar'
+ index = p.expect (['bar', 'foo', 'foobar'])
+ # returns 1 ('foo') even though 'foobar' is a "better" match
+
+ Please note, however, that buffering can affect this behavior, since
+ input arrives in unpredictable chunks. For example::
+
+ # the input is 'foobar'
+ index = p.expect (['foobar', 'foo'])
+ # returns 0 ('foobar') if all input is available at once,
+ # but returs 1 ('foo') if parts of the final 'bar' arrive late
+
+ After a match is found the instance attributes 'before', 'after' and
+ 'match' will be set. You can see all the data read before the match in
+ 'before'. You can see the data that was matched in 'after'. The
+ re.MatchObject used in the re match will be in 'match'. If an error
+ occurred then 'before' will be set to all the data read so far and
+ 'after' and 'match' will be None.
+
+ If timeout is -1 then timeout will be set to the self.timeout value.
+
+ A list entry may be EOF or TIMEOUT instead of a string. This will
+ catch these exceptions and return the index of the list entry instead
+ of raising the exception. The attribute 'after' will be set to the
+ exception type. The attribute 'match' will be None. This allows you to
+ write code like this::
+
+ index = p.expect (['good', 'bad', pexpect.EOF, pexpect.TIMEOUT])
+ if index == 0:
+ do_something()
+ elif index == 1:
+ do_something_else()
+ elif index == 2:
+ do_some_other_thing()
+ elif index == 3:
+ do_something_completely_different()
+
+ instead of code like this::
+
+ try:
+ index = p.expect (['good', 'bad'])
+ if index == 0:
+ do_something()
+ elif index == 1:
+ do_something_else()
+ except EOF:
+ do_some_other_thing()
+ except TIMEOUT:
+ do_something_completely_different()
+
+ These two forms are equivalent. It all depends on what you want. You
+ can also just expect the EOF if you are waiting for all output of a
+ child to finish. For example::
+
+ p = pexpect.spawn('/bin/ls')
+ p.expect (pexpect.EOF)
+ print p.before
+
+ If you are trying to optimize for speed then see expect_list().
+ """
+
+ compiled_pattern_list = self.compile_pattern_list(pattern)
+ return self.expect_list(compiled_pattern_list, timeout, searchwindowsize)
+
+ def expect_list(self, pattern_list, timeout = -1, searchwindowsize = -1):
+
+ """This takes a list of compiled regular expressions and returns the
+ index into the pattern_list that matched the child output. The list may
+ also contain EOF or TIMEOUT (which are not compiled regular
+ expressions). This method is similar to the expect() method except that
+ expect_list() does not recompile the pattern list on every call. This
+ may help if you are trying to optimize for speed, otherwise just use
+ the expect() method. This is called by expect(). If timeout==-1 then
+ the self.timeout value is used. If searchwindowsize==-1 then the
+ self.searchwindowsize value is used. """
+
+ return self.expect_loop(searcher_re(pattern_list), timeout, searchwindowsize)
+
+ def expect_exact(self, pattern_list, timeout = -1, searchwindowsize = -1):
+
+ """This is similar to expect(), but uses plain string matching instead
+ of compiled regular expressions in 'pattern_list'. The 'pattern_list'
+ may be a string; a list or other sequence of strings; or TIMEOUT and
+ EOF.
+
+ This call might be faster than expect() for two reasons: string
+ searching is faster than RE matching and it is possible to limit the
+ search to just the end of the input buffer.
+
+ This method is also useful when you don't want to have to worry about
+ escaping regular expression characters that you want to match."""
+
+ if isinstance(pattern_list, (bytes, str)) or pattern_list in (TIMEOUT, EOF):
+ pattern_list = [pattern_list]
+ return self.expect_loop(searcher_string(pattern_list), timeout, searchwindowsize)
+
+ def expect_loop(self, searcher, timeout = -1, searchwindowsize = -1):
+
+ """This is the common loop used inside expect. The 'searcher' should be
+ an instance of searcher_re or searcher_string, which describes how and what
+ to search for in the input.
+
+ See expect() for other arguments, return value and exceptions. """
+
+ self.searcher = searcher
+
+ if timeout == -1:
+ timeout = self.timeout
+ if timeout is not None:
+ end_time = time.time() + timeout
+ if searchwindowsize == -1:
+ searchwindowsize = self.searchwindowsize
+
+ try:
+ incoming = self.buffer
+ freshlen = len(incoming)
+ while True: # Keep reading until exception or return.
+ index = searcher.search(incoming, freshlen, searchwindowsize)
+ if index >= 0:
+ self.buffer = incoming[searcher.end : ]
+ self.before = incoming[ : searcher.start]
+ self.after = incoming[searcher.start : searcher.end]
+ self.match = searcher.match
+ self.match_index = index
+ return self.match_index
+ # No match at this point
+ if timeout is not None and timeout < 0:
+ raise TIMEOUT ('Timeout exceeded in expect_any().')
+ # Still have time left, so read more data
+ c = self.read_nonblocking (self.maxread, timeout)
+ freshlen = len(c)
+ time.sleep (0.0001)
+ incoming = incoming + c
+ if timeout is not None:
+ timeout = end_time - time.time()
+ except EOF as e:
+ self.buffer = self._empty_buffer
+ self.before = incoming
+ self.after = EOF
+ index = searcher.eof_index
+ if index >= 0:
+ self.match = EOF
+ self.match_index = index
+ return self.match_index
+ else:
+ self.match = None
+ self.match_index = None
+ raise EOF (str(e) + '\n' + str(self))
+ except TIMEOUT as e:
+ self.buffer = incoming
+ self.before = incoming
+ self.after = TIMEOUT
+ index = searcher.timeout_index
+ if index >= 0:
+ self.match = TIMEOUT
+ self.match_index = index
+ return self.match_index
+ else:
+ self.match = None
+ self.match_index = None
+ raise TIMEOUT (str(e) + '\n' + str(self))
+ except:
+ self.before = incoming
+ self.after = None
+ self.match = None
+ self.match_index = None
+ raise
+
+ def getwinsize(self):
+
+ """This returns the terminal window size of the child tty. The return
+ value is a tuple of (rows, cols). """
+
+ TIOCGWINSZ = getattr(termios, 'TIOCGWINSZ', 1074295912)
+ s = struct.pack('HHHH', 0, 0, 0, 0)
+ x = fcntl.ioctl(self.fileno(), TIOCGWINSZ, s)
+ return struct.unpack('HHHH', x)[0:2]
+
+ def setwinsize(self, r, c):
+
+ """This sets the terminal window size of the child tty. This will cause
+ a SIGWINCH signal to be sent to the child. This does not change the
+ physical window size. It changes the size reported to TTY-aware
+ applications like vi or curses -- applications that respond to the
+ SIGWINCH signal. """
+
+ # Check for buggy platforms. Some Python versions on some platforms
+ # (notably OSF1 Alpha and RedHat 7.1) truncate the value for
+ # termios.TIOCSWINSZ. It is not clear why this happens.
+ # These platforms don't seem to handle the signed int very well;
+ # yet other platforms like OpenBSD have a large negative value for
+ # TIOCSWINSZ and they don't have a truncate problem.
+ # Newer versions of Linux have totally different values for TIOCSWINSZ.
+ # Note that this fix is a hack.
+ TIOCSWINSZ = getattr(termios, 'TIOCSWINSZ', -2146929561)
+ if TIOCSWINSZ == 2148037735: # L is not required in Python >= 2.2.
+ TIOCSWINSZ = -2146929561 # Same bits, but with sign.
+ # Note, assume ws_xpixel and ws_ypixel are zero.
+ s = struct.pack('HHHH', r, c, 0, 0)
+ fcntl.ioctl(self.fileno(), TIOCSWINSZ, s)
+
+ def interact(self, escape_character = b'\x1d', input_filter = None, output_filter = None):
+
+ """This gives control of the child process to the interactive user (the
+ human at the keyboard). Keystrokes are sent to the child process, and
+ the stdout and stderr output of the child process is printed. This
+ simply echos the child stdout and child stderr to the real stdout and
+ it echos the real stdin to the child stdin. When the user types the
+ escape_character this method will stop. The default for
+ escape_character is ^]. This should not be confused with ASCII 27 --
+ the ESC character. ASCII 29 was chosen for historical merit because
+ this is the character used by 'telnet' as the escape character. The
+ escape_character will not be sent to the child process.
+
+ You may pass in optional input and output filter functions. These
+ functions should take a string and return a string. The output_filter
+ will be passed all the output from the child process. The input_filter
+ will be passed all the keyboard input from the user. The input_filter
+ is run BEFORE the check for the escape_character.
+
+ Note that if you change the window size of the parent the SIGWINCH
+ signal will not be passed through to the child. If you want the child
+ window size to change when the parent's window size changes then do
+ something like the following example::
+
+ import pexpect, struct, fcntl, termios, signal, sys
+ def sigwinch_passthrough (sig, data):
+ s = struct.pack("HHHH", 0, 0, 0, 0)
+ a = struct.unpack('hhhh', fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ , s))
+ global p
+ p.setwinsize(a[0],a[1])
+ p = pexpect.spawn('/bin/bash') # Note this is global and used in sigwinch_passthrough.
+ signal.signal(signal.SIGWINCH, sigwinch_passthrough)
+ p.interact()
+ """
+
+ # Flush the buffer.
+ if PY3: self.stdout.write(_cast_unicode(self.buffer, self.encoding))
+ else: self.stdout.write(self.buffer)
+ self.stdout.flush()
+ self.buffer = self._empty_buffer
+ mode = tty.tcgetattr(self.STDIN_FILENO)
+ tty.setraw(self.STDIN_FILENO)
+ try:
+ self.__interact_copy(escape_character, input_filter, output_filter)
+ finally:
+ tty.tcsetattr(self.STDIN_FILENO, tty.TCSAFLUSH, mode)
+
+ def __interact_writen(self, fd, data):
+
+ """This is used by the interact() method.
+ """
+
+ while data != b'' and self.isalive():
+ n = os.write(fd, data)
+ data = data[n:]
+
+ def __interact_read(self, fd):
+
+ """This is used by the interact() method.
+ """
+
+ return os.read(fd, 1000)
+
+ def __interact_copy(self, escape_character = None, input_filter = None, output_filter = None):
+
+ """This is used by the interact() method.
+ """
+
+ while self.isalive():
+ r,w,e = self.__select([self.child_fd, self.STDIN_FILENO], [], [])
+ if self.child_fd in r:
+ data = self.__interact_read(self.child_fd)
+ if output_filter: data = output_filter(data)
+ if self.logfile is not None:
+ self.logfile.write (data)
+ self.logfile.flush()
+ os.write(self.STDOUT_FILENO, data)
+ if self.STDIN_FILENO in r:
+ data = self.__interact_read(self.STDIN_FILENO)
+ if input_filter: data = input_filter(data)
+ i = data.rfind(escape_character)
+ if i != -1:
+ data = data[:i]
+ self.__interact_writen(self.child_fd, data)
+ break
+ self.__interact_writen(self.child_fd, data)
+
+ def __select (self, iwtd, owtd, ewtd, timeout=None):
+
+ """This is a wrapper around select.select() that ignores signals. If
+ select.select raises a select.error exception and errno is an EINTR
+ error then it is ignored. Mainly this is used to ignore sigwinch
+ (terminal resize). """
+
+ # if select() is interrupted by a signal (errno==EINTR) then
+ # we loop back and enter the select() again.
+ if timeout is not None:
+ end_time = time.time() + timeout
+ while True:
+ try:
+ return select.select (iwtd, owtd, ewtd, timeout)
+ except select.error as e:
+ if e.args[0] == errno.EINTR:
+ # if we loop back we have to subtract the amount of time we already waited.
+ if timeout is not None:
+ timeout = end_time - time.time()
+ if timeout < 0:
+ return ([],[],[])
+ else: # something else caused the select.error, so this really is an exception
+ raise
+
+class spawn(spawnb):
+ """This is the main class interface for Pexpect. Use this class to start
+ and control child applications."""
+
+ _buffer_type = str
+ def _cast_buffer_type(self, s):
+ return _cast_unicode(s, self.encoding)
+ _empty_buffer = ''
+ _pty_newline = '\r\n'
+
+ def __init__(self, command, args=[], timeout=30, maxread=2000, searchwindowsize=None,
+ logfile=None, cwd=None, env=None, encoding='utf-8'):
+ super(spawn, self).__init__(command, args, timeout=timeout, maxread=maxread,
+ searchwindowsize=searchwindowsize, logfile=logfile, cwd=cwd, env=env)
+ self.encoding = encoding
+
+ def _prepare_regex_pattern(self, p):
+ "Recompile bytes regexes as unicode regexes."
+ if isinstance(p.pattern, bytes):
+ p = re.compile(p.pattern.decode(self.encoding), p.flags)
+ return p
+
+ def read_nonblocking(self, size=1, timeout=-1):
+ return super(spawn, self).read_nonblocking(size=size, timeout=timeout)\
+ .decode(self.encoding)
+
+ read_nonblocking.__doc__ = spawnb.read_nonblocking.__doc__
+
+
+##############################################################################
+# End of spawn class
+##############################################################################
+
+class searcher_string (object):
+
+ """This is a plain string search helper for the spawn.expect_any() method.
+ This helper class is for speed. For more powerful regex patterns
+ see the helper class, searcher_re.
+
+ Attributes:
+
+ eof_index - index of EOF, or -1
+ timeout_index - index of TIMEOUT, or -1
+
+ After a successful match by the search() method the following attributes
+ are available:
+
+ start - index into the buffer, first byte of match
+ end - index into the buffer, first byte after match
+ match - the matching string itself
+
+ """
+
+ def __init__(self, strings):
+
+ """This creates an instance of searcher_string. This argument 'strings'
+ may be a list; a sequence of strings; or the EOF or TIMEOUT types. """
+
+ self.eof_index = -1
+ self.timeout_index = -1
+ self._strings = []
+ for n, s in enumerate(strings):
+ if s is EOF:
+ self.eof_index = n
+ continue
+ if s is TIMEOUT:
+ self.timeout_index = n
+ continue
+ self._strings.append((n, s))
+
+ def __str__(self):
+
+ """This returns a human-readable string that represents the state of
+ the object."""
+
+ ss = [ (ns[0],' %d: "%s"' % ns) for ns in self._strings ]
+ ss.append((-1,'searcher_string:'))
+ if self.eof_index >= 0:
+ ss.append ((self.eof_index,' %d: EOF' % self.eof_index))
+ if self.timeout_index >= 0:
+ ss.append ((self.timeout_index,' %d: TIMEOUT' % self.timeout_index))
+ ss.sort()
+ return '\n'.join(a[1] for a in ss)
+
+ def search(self, buffer, freshlen, searchwindowsize=None):
+
+ """This searches 'buffer' for the first occurence of one of the search
+ strings. 'freshlen' must indicate the number of bytes at the end of
+ 'buffer' which have not been searched before. It helps to avoid
+ searching the same, possibly big, buffer over and over again.
+
+ See class spawn for the 'searchwindowsize' argument.
+
+ If there is a match this returns the index of that string, and sets
+ 'start', 'end' and 'match'. Otherwise, this returns -1. """
+
+ absurd_match = len(buffer)
+ first_match = absurd_match
+
+ # 'freshlen' helps a lot here. Further optimizations could
+ # possibly include:
+ #
+ # using something like the Boyer-Moore Fast String Searching
+ # Algorithm; pre-compiling the search through a list of
+ # strings into something that can scan the input once to
+ # search for all N strings; realize that if we search for
+ # ['bar', 'baz'] and the input is '...foo' we need not bother
+ # rescanning until we've read three more bytes.
+ #
+ # Sadly, I don't know enough about this interesting topic. /grahn
+
+ for index, s in self._strings:
+ if searchwindowsize is None:
+ # the match, if any, can only be in the fresh data,
+ # or at the very end of the old data
+ offset = -(freshlen+len(s))
+ else:
+ # better obey searchwindowsize
+ offset = -searchwindowsize
+ n = buffer.find(s, offset)
+ if n >= 0 and n < first_match:
+ first_match = n
+ best_index, best_match = index, s
+ if first_match == absurd_match:
+ return -1
+ self.match = best_match
+ self.start = first_match
+ self.end = self.start + len(self.match)
+ return best_index
+
+class searcher_re (object):
+
+ """This is regular expression string search helper for the
+ spawn.expect_any() method. This helper class is for powerful
+ pattern matching. For speed, see the helper class, searcher_string.
+
+ Attributes:
+
+ eof_index - index of EOF, or -1
+ timeout_index - index of TIMEOUT, or -1
+
+ After a successful match by the search() method the following attributes
+ are available:
+
+ start - index into the buffer, first byte of match
+ end - index into the buffer, first byte after match
+ match - the re.match object returned by a succesful re.search
+
+ """
+
+ def __init__(self, patterns):
+
+ """This creates an instance that searches for 'patterns' Where
+ 'patterns' may be a list or other sequence of compiled regular
+ expressions, or the EOF or TIMEOUT types."""
+
+ self.eof_index = -1
+ self.timeout_index = -1
+ self._searches = []
+ for n, s in enumerate(patterns):
+ if s is EOF:
+ self.eof_index = n
+ continue
+ if s is TIMEOUT:
+ self.timeout_index = n
+ continue
+ self._searches.append((n, s))
+
+ def __str__(self):
+
+ """This returns a human-readable string that represents the state of
+ the object."""
+
+ ss = [ (n,' %d: re.compile("%s")' % (n,str(s.pattern))) for n,s in self._searches]
+ ss.append((-1,'searcher_re:'))
+ if self.eof_index >= 0:
+ ss.append ((self.eof_index,' %d: EOF' % self.eof_index))
+ if self.timeout_index >= 0:
+ ss.append ((self.timeout_index,' %d: TIMEOUT' % self.timeout_index))
+ ss.sort()
+ return '\n'.join(a[1] for a in ss)
+
+ def search(self, buffer, freshlen, searchwindowsize=None):
+
+ """This searches 'buffer' for the first occurence of one of the regular
+ expressions. 'freshlen' must indicate the number of bytes at the end of
+ 'buffer' which have not been searched before.
+
+ See class spawn for the 'searchwindowsize' argument.
+
+ If there is a match this returns the index of that string, and sets
+ 'start', 'end' and 'match'. Otherwise, returns -1."""
+
+ absurd_match = len(buffer)
+ first_match = absurd_match
+ # 'freshlen' doesn't help here -- we cannot predict the
+ # length of a match, and the re module provides no help.
+ if searchwindowsize is None:
+ searchstart = 0
+ else:
+ searchstart = max(0, len(buffer)-searchwindowsize)
+ for index, s in self._searches:
+ match = s.search(buffer, searchstart)
+ if match is None:
+ continue
+ n = match.start()
+ if n < first_match:
+ first_match = n
+ the_match = match
+ best_index = index
+ if first_match == absurd_match:
+ return -1
+ self.start = first_match
+ self.match = the_match
+ self.end = self.match.end()
+ return best_index
+
+def which (filename):
+
+ """This takes a given filename; tries to find it in the environment path;
+ then checks if it is executable. This returns the full path to the filename
+ if found and executable. Otherwise this returns None."""
+
+ # Special case where filename already contains a path.
+ if os.path.dirname(filename) != '':
+ if os.access (filename, os.X_OK):
+ return filename
+
+ if 'PATH' not in os.environ or os.environ['PATH'] == '':
+ p = os.defpath
+ else:
+ p = os.environ['PATH']
+
+ pathlist = p.split(os.pathsep)
+
+ for path in pathlist:
+ f = os.path.join(path, filename)
+ if os.access(f, os.X_OK):
+ return f
+ return None
+
+def split_command_line(command_line):
+
+ """This splits a command line into a list of arguments. It splits arguments
+ on spaces, but handles embedded quotes, doublequotes, and escaped
+ characters. It's impossible to do this with a regular expression, so I
+ wrote a little state machine to parse the command line. """
+
+ arg_list = []
+ arg = ''
+
+ # Constants to name the states we can be in.
+ state_basic = 0
+ state_esc = 1
+ state_singlequote = 2
+ state_doublequote = 3
+ state_whitespace = 4 # The state of consuming whitespace between commands.
+ state = state_basic
+
+ for c in command_line:
+ if state == state_basic or state == state_whitespace:
+ if c == '\\': # Escape the next character
+ state = state_esc
+ elif c == r"'": # Handle single quote
+ state = state_singlequote
+ elif c == r'"': # Handle double quote
+ state = state_doublequote
+ elif c.isspace():
+ # Add arg to arg_list if we aren't in the middle of whitespace.
+ if state == state_whitespace:
+ None # Do nothing.
+ else:
+ arg_list.append(arg)
+ arg = ''
+ state = state_whitespace
+ else:
+ arg = arg + c
+ state = state_basic
+ elif state == state_esc:
+ arg = arg + c
+ state = state_basic
+ elif state == state_singlequote:
+ if c == r"'":
+ state = state_basic
+ else:
+ arg = arg + c
+ elif state == state_doublequote:
+ if c == r'"':
+ state = state_basic
+ else:
+ arg = arg + c
+
+ if arg != '':
+ arg_list.append(arg)
+ return arg_list
+
+# vi:set sr et ts=4 sw=4 ft=python :
diff -Nru catfish-0.6.3/catfish_lib/pexpect/fdpexpect.py catfish-0.8.2/catfish_lib/pexpect/fdpexpect.py
--- catfish-0.6.3/catfish_lib/pexpect/fdpexpect.py 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/pexpect/fdpexpect.py 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,82 @@
+"""This is like pexpect, but will work on any file descriptor that you pass it.
+So you are reponsible for opening and close the file descriptor.
+
+$Id: fdpexpect.py 505 2007-12-26 21:33:50Z noah $
+"""
+
+from pexpect import *
+import os
+
+__all__ = ['fdspawn']
+
+class fdspawn (spawn):
+
+ """This is like pexpect.spawn but allows you to supply your own open file
+ descriptor. For example, you could use it to read through a file looking
+ for patterns, or to control a modem or serial device. """
+
+ def __init__ (self, fd, args=[], timeout=30, maxread=2000, searchwindowsize=None, logfile=None):
+
+ """This takes a file descriptor (an int) or an object that support the
+ fileno() method (returning an int). All Python file-like objects
+ support fileno(). """
+
+ ### TODO: Add better handling of trying to use fdspawn in place of spawn
+ ### TODO: (overload to allow fdspawn to also handle commands as spawn does.
+
+ if type(fd) != type(0) and hasattr(fd, 'fileno'):
+ fd = fd.fileno()
+
+ if type(fd) != type(0):
+ raise ExceptionPexpect ('The fd argument is not an int. If this is a command string then maybe you want to use pexpect.spawn.')
+
+ try: # make sure fd is a valid file descriptor
+ os.fstat(fd)
+ except OSError:
+ raise ExceptionPexpect('The fd argument is not a valid file descriptor.')
+
+ self.args = None
+ self.command = None
+ spawn.__init__(self, None, args, timeout, maxread, searchwindowsize, logfile)
+ self.child_fd = fd
+ self.own_fd = False
+ self.closed = False
+ self.name = '' % fd
+
+ def __del__ (self):
+
+ return
+
+ def close (self):
+
+ if self.child_fd == -1:
+ return
+ if self.own_fd:
+ self.close (self)
+ else:
+ self.flush()
+ os.close(self.child_fd)
+ self.child_fd = -1
+ self.closed = True
+
+ def isalive (self):
+
+ """This checks if the file descriptor is still valid. If os.fstat()
+ does not raise an exception then we assume it is alive. """
+
+ if self.child_fd == -1:
+ return False
+ try:
+ os.fstat(self.child_fd)
+ return True
+ except:
+ return False
+
+ def terminate (self, force=False):
+
+ raise ExceptionPexpect ('This method is not valid for file descriptors.')
+
+ def kill (self, sig):
+
+ return
+
diff -Nru catfish-0.6.3/catfish_lib/pexpect/psh.py catfish-0.8.2/catfish_lib/pexpect/psh.py
--- catfish-0.6.3/catfish_lib/pexpect/psh.py 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/pexpect/psh.py 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,164 @@
+"""This is a utility class to make shell scripting easier in Python.
+It combines Pexpect and wraps many Standard Python Library functions
+to make them look more shell-like.
+
+$Id: psh.py 519 2008-12-06 03:57:06Z noah $
+"""
+
+import pexpect, os, sys, re
+from types import *
+
+class ExceptionPsh(pexpect.ExceptionPexpect):
+
+ """Raised for Psh exceptions.
+ """
+
+class ExceptionErrorCode(ExceptionPsh):
+
+ """Raised when an program returns an error code.
+ """
+
+ def __init__(self, string, err_code, cmd_output):
+
+ ExceptionPsh.__init__(self,string)
+ self.error = err_code
+ self.output = cmd_output
+
+class psh (object):
+
+ def __init__ (self,exp):
+
+ self.exp = exp
+ self.default_timeout = 30 # Seconds
+
+ def ls (self, path=''):
+
+ fileStr = self.run("ls %s" % path)
+ return fileStr.split()
+
+ def cd (self, path='-'):
+
+ return self.run("cd %s" % path)
+
+ def rm (self, path=''):
+
+ return self.run("/bin/rm -f %s" % path)
+
+ def cp (self, path_from='', path_to=''):
+
+ return self.run("/bin/cp %s %s" % (path_from, path_to))
+
+ def mv (self, path_from='', path_to=''):
+
+ return self.run("/bin/mv %s %s" % (path_from, path_to))
+
+ def pwd (self):
+
+ return self.run("/bin/pwd")
+
+ def which (self, exe_name):
+
+ return self.run("/usr/bin/which %s" % exe_name)
+
+ def chown (self, path, user='', group=None, recurse=False):
+
+ xtra_flags = ""
+ if recurse: xtra_flags = "-R"
+ if group: group = ':' + group
+ else: group = ""
+
+ return self.run("/bin/chmod %s %s%s %s" % (recurse,user,group,path))
+
+ def chmod (self, path, perms='', recurse=False):
+
+ xtra_flags = ""
+ if recurse: xtra_flags = "-R"
+ return self.run("/usr/bin/chmod %s %s %s" % (xtra_flags, perms, path))
+
+ def chattr (self, path, attrs='', recurse=False):
+
+ xtra_flags = ""
+ if recurse: xtra_flags = "-R"
+ return self.run("/usr/bin/chattr %s %s %s" % (xtra_flags, attrs, path))
+
+ def cat (self, path):
+
+ return self.run("/bin/cat %s" % path)
+
+ def run (self, cmd, stim_resp_dict = {}, timeout=None):
+
+ (ret, output) = self.run_raw(cmd, stim_resp_dict, timeout)
+ if ret == 0: return output
+ raise ExceptionErrorCode("Running command [%s] returned error [%d]" % (cmd,ret), ret, output)
+
+ def run_raw(self, cmd, stim_resp_dict=None, timeout=None):
+
+ """Someone contributed this, but now I've lost touch and I forget the motive of this.
+ It was sort of a sketch at the time which doesn't make this any easier to prioritize, but
+ it seemed important at the time.
+ """
+
+ if not timeout: timeout = self.default_timeout
+
+ def cmd_exp_loop(param):
+ if type(param) is DictType:
+ param = (param,)
+ for item in param:
+ if type(item) is type(()) or type(item) is type([]):
+ cmd_exp_loop(item)
+ elif type(item) is type(""):
+ self.exp.send(item)
+ elif type(item) is type({}):
+ dict = item
+ while(1):
+ stimulus = list(dict.keys())
+ idx = self.exp.expect_exact(stimulus, timeout)
+ keys = list(dict.keys())
+ respond = dict[keys[idx]]
+ if type(respond) is type({}) or type(respond) is type(()) or type(item) is type([]):
+ cmd_exp_loop(respond)
+ if type(respond) is type(""):
+ self.exp.send(respond)
+ elif type(respond) is InstanceType and Exception in inspect.getmro(respond.__class__):
+ raise respond
+ elif type(respond) is type(0):
+ return (respond, self.exp.before)
+ elif respond is None:
+ break
+ else:
+ self.exp.send(str(respond))
+
+ if stim_resp_dict == None:
+ stim_resp_dict = {}
+
+ self.exp.sendline("")
+ if not self.exp.prompt(): raise SessionException("No prompt")
+ self.exp.sendline(cmd)
+ self.exp.expect_exact([cmd])
+ stim_resp_dict[re.compile(self.exp.PROMPT)] = None
+ cmd_exp_loop(stim_resp_dict)
+
+ output = self.exp.before
+ # Get the return code
+ self.exp.sendline("echo $?")
+ self.exp.expect_exact(["echo $?"])
+ if not self.exp.prompt(): raise SessionException("No prompt", 0, self.exp.before)
+ try:
+ reg = re.compile("^(\d+)")
+ s = self.exp.before.strip()
+ #print s
+ #pdb.set_trace()
+ s = reg.search(s).groups()[0]
+ error_code = int(s)
+ except ValueError:
+ log.error("Cannot parse %s into an int!" % self.exp.before)
+ raise
+
+ if not output[0:2] == '\r\n':
+ log.warning("Returned output lacks leading \\r\\n which may indicate a tae error")
+ log.debug2("Offending output string: [%s]" % output)
+ return (error_code, output)
+ else:
+ return(error_code, output[2:])
+
+# def pipe (self, cmd, string_to_send):
diff -Nru catfish-0.6.3/catfish_lib/pexpect/pxssh.py catfish-0.8.2/catfish_lib/pexpect/pxssh.py
--- catfish-0.6.3/catfish_lib/pexpect/pxssh.py 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/pexpect/pxssh.py 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,326 @@
+"""This class extends pexpect.spawn to specialize setting up SSH connections.
+This adds methods for login, logout, and expecting the shell prompt.
+
+$Id: pxssh.py 523 2010-10-17 11:01:22Z noah $
+"""
+
+from pexpect import *
+import pexpect
+import time
+import os
+
+__all__ = ['ExceptionPxssh', 'pxssh']
+
+# Exception classes used by this module.
+class ExceptionPxssh(ExceptionPexpect):
+ """Raised for pxssh exceptions.
+ """
+
+class pxssh (spawn):
+
+ """This class extends pexpect.spawn to specialize setting up SSH
+ connections. This adds methods for login, logout, and expecting the shell
+ prompt. It does various tricky things to handle many situations in the SSH
+ login process. For example, if the session is your first login, then pxssh
+ automatically accepts the remote certificate; or if you have public key
+ authentication setup then pxssh won't wait for the password prompt.
+
+ pxssh uses the shell prompt to synchronize output from the remote host. In
+ order to make this more robust it sets the shell prompt to something more
+ unique than just $ or #. This should work on most Borne/Bash or Csh style
+ shells.
+
+ Example that runs a few commands on a remote server and prints the result::
+
+ import pxssh
+ import getpass
+ try:
+ s = pxssh.pxssh()
+ hostname = raw_input('hostname: ')
+ username = raw_input('username: ')
+ password = getpass.getpass('password: ')
+ s.login (hostname, username, password)
+ s.sendline ('uptime') # run a command
+ s.prompt() # match the prompt
+ print s.before # print everything before the prompt.
+ s.sendline ('ls -l')
+ s.prompt()
+ print s.before
+ s.sendline ('df')
+ s.prompt()
+ print s.before
+ s.logout()
+ except pxssh.ExceptionPxssh, e:
+ print "pxssh failed on login."
+ print str(e)
+
+ Note that if you have ssh-agent running while doing development with pxssh
+ then this can lead to a lot of confusion. Many X display managers (xdm,
+ gdm, kdm, etc.) will automatically start a GUI agent. You may see a GUI
+ dialog box popup asking for a password during development. You should turn
+ off any key agents during testing. The 'force_password' attribute will turn
+ off public key authentication. This will only work if the remote SSH server
+ is configured to allow password logins. Example of using 'force_password'
+ attribute::
+
+ s = pxssh.pxssh()
+ s.force_password = True
+ hostname = raw_input('hostname: ')
+ username = raw_input('username: ')
+ password = getpass.getpass('password: ')
+ s.login (hostname, username, password)
+ """
+
+ def __init__ (self, timeout=30, maxread=2000, searchwindowsize=None, logfile=None, cwd=None, env=None):
+
+ spawn.__init__(self, None, timeout=timeout, maxread=maxread, searchwindowsize=searchwindowsize, logfile=logfile, cwd=cwd, env=env)
+
+ self.name = ''
+
+ #SUBTLE HACK ALERT! Note that the command that SETS the prompt uses a
+ #slightly different string than the regular expression to match it. This
+ #is because when you set the prompt the command will echo back, but we
+ #don't want to match the echoed command. So if we make the set command
+ #slightly different than the regex we eliminate the problem. To make the
+ #set command different we add a backslash in front of $. The $ doesn't
+ #need to be escaped, but it doesn't hurt and serves to make the set
+ #prompt command different than the regex.
+
+ # used to match the command-line prompt
+ self.UNIQUE_PROMPT = "\[PEXPECT\][\$\#] "
+ self.PROMPT = self.UNIQUE_PROMPT
+
+ # used to set shell command-line prompt to UNIQUE_PROMPT.
+ self.PROMPT_SET_SH = "PS1='[PEXPECT]\$ '"
+ self.PROMPT_SET_CSH = "set prompt='[PEXPECT]\$ '"
+ self.SSH_OPTS = "-o'RSAAuthentication=no' -o 'PubkeyAuthentication=no'"
+ # Disabling X11 forwarding gets rid of the annoying SSH_ASKPASS from
+ # displaying a GUI password dialog. I have not figured out how to
+ # disable only SSH_ASKPASS without also disabling X11 forwarding.
+ # Unsetting SSH_ASKPASS on the remote side doesn't disable it! Annoying!
+ #self.SSH_OPTS = "-x -o'RSAAuthentication=no' -o 'PubkeyAuthentication=no'"
+ self.force_password = False
+ self.auto_prompt_reset = True
+
+ def levenshtein_distance(self, a,b):
+
+ """This calculates the Levenshtein distance between a and b.
+ """
+
+ n, m = len(a), len(b)
+ if n > m:
+ a,b = b,a
+ n,m = m,n
+ current = list(range(n+1))
+ for i in range(1,m+1):
+ previous, current = current, [i]+[0]*n
+ for j in range(1,n+1):
+ add, delete = previous[j]+1, current[j-1]+1
+ change = previous[j-1]
+ if a[j-1] != b[i-1]:
+ change = change + 1
+ current[j] = min(add, delete, change)
+ return current[n]
+
+ def sync_original_prompt (self):
+
+ """This attempts to find the prompt. Basically, press enter and record
+ the response; press enter again and record the response; if the two
+ responses are similar then assume we are at the original prompt. This
+ is a slow function. It can take over 10 seconds. """
+
+ # All of these timing pace values are magic.
+ # I came up with these based on what seemed reliable for
+ # connecting to a heavily loaded machine I have.
+ self.sendline()
+ time.sleep(0.1)
+ # If latency is worse than these values then this will fail.
+
+ try:
+ self.read_nonblocking(size=10000,timeout=1) # GAS: Clear out the cache before getting the prompt
+ except TIMEOUT:
+ pass
+ time.sleep(0.1)
+ self.sendline()
+ time.sleep(0.5)
+ x = self.read_nonblocking(size=1000,timeout=1)
+ time.sleep(0.1)
+ self.sendline()
+ time.sleep(0.5)
+ a = self.read_nonblocking(size=1000,timeout=1)
+ time.sleep(0.1)
+ self.sendline()
+ time.sleep(0.5)
+ b = self.read_nonblocking(size=1000,timeout=1)
+ ld = self.levenshtein_distance(a,b)
+ len_a = len(a)
+ if len_a == 0:
+ return False
+ if float(ld)/len_a < 0.4:
+ return True
+ return False
+
+ ### TODO: This is getting messy and I'm pretty sure this isn't perfect.
+ ### TODO: I need to draw a flow chart for this.
+ def login (self,server,username,password='',terminal_type='ansi',original_prompt=r"[#$]",login_timeout=10,port=None,auto_prompt_reset=True,ssh_key=None):
+
+ """This logs the user into the given server. It uses the
+ 'original_prompt' to try to find the prompt right after login. When it
+ finds the prompt it immediately tries to reset the prompt to something
+ more easily matched. The default 'original_prompt' is very optimistic
+ and is easily fooled. It's more reliable to try to match the original
+ prompt as exactly as possible to prevent false matches by server
+ strings such as the "Message Of The Day". On many systems you can
+ disable the MOTD on the remote server by creating a zero-length file
+ called "~/.hushlogin" on the remote server. If a prompt cannot be found
+ then this will not necessarily cause the login to fail. In the case of
+ a timeout when looking for the prompt we assume that the original
+ prompt was so weird that we could not match it, so we use a few tricks
+ to guess when we have reached the prompt. Then we hope for the best and
+ blindly try to reset the prompt to something more unique. If that fails
+ then login() raises an ExceptionPxssh exception.
+
+ In some situations it is not possible or desirable to reset the
+ original prompt. In this case, set 'auto_prompt_reset' to False to
+ inhibit setting the prompt to the UNIQUE_PROMPT. Remember that pxssh
+ uses a unique prompt in the prompt() method. If the original prompt is
+ not reset then this will disable the prompt() method unless you
+ manually set the PROMPT attribute. """
+
+ ssh_options = '-q'
+ if self.force_password:
+ ssh_options = ssh_options + ' ' + self.SSH_OPTS
+ if port is not None:
+ ssh_options = ssh_options + ' -p %s'%(str(port))
+ if ssh_key is not None:
+ try:
+ os.path.isfile(ssh_key)
+ except:
+ raise ExceptionPxssh ('private ssh key does not exist')
+ ssh_options = ssh_options + ' -i %s' % (ssh_key)
+ cmd = "ssh %s -l %s %s" % (ssh_options, username, server)
+
+ # This does not distinguish between a remote server 'password' prompt
+ # and a local ssh 'passphrase' prompt (for unlocking a private key).
+ spawn._spawn(self, cmd)
+ i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT, "(?i)connection closed by remote host"], timeout=login_timeout)
+
+ # First phase
+ if i==0:
+ # New certificate -- always accept it.
+ # This is what you get if SSH does not have the remote host's
+ # public key stored in the 'known_hosts' cache.
+ self.sendline("yes")
+ i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT])
+ if i==2: # password or passphrase
+ self.sendline(password)
+ i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT])
+ if i==4:
+ self.sendline(terminal_type)
+ i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT])
+
+ # Second phase
+ if i==0:
+ # This is weird. This should not happen twice in a row.
+ self.close()
+ raise ExceptionPxssh ('Weird error. Got "are you sure" prompt twice.')
+ elif i==1: # can occur if you have a public key pair set to authenticate.
+ ### TODO: May NOT be OK if expect() got tricked and matched a false prompt.
+ pass
+ elif i==2: # password prompt again
+ # For incorrect passwords, some ssh servers will
+ # ask for the password again, others return 'denied' right away.
+ # If we get the password prompt again then this means
+ # we didn't get the password right the first time.
+ self.close()
+ raise ExceptionPxssh ('password refused')
+ elif i==3: # permission denied -- password was bad.
+ self.close()
+ raise ExceptionPxssh ('permission denied')
+ elif i==4: # terminal type again? WTF?
+ self.close()
+ raise ExceptionPxssh ('Weird error. Got "terminal type" prompt twice.')
+ elif i==5: # Timeout
+ #This is tricky... I presume that we are at the command-line prompt.
+ #It may be that the shell prompt was so weird that we couldn't match
+ #it. Or it may be that we couldn't log in for some other reason. I
+ #can't be sure, but it's safe to guess that we did login because if
+ #I presume wrong and we are not logged in then this should be caught
+ #later when I try to set the shell prompt.
+ pass
+ elif i==6: # Connection closed by remote host
+ self.close()
+ raise ExceptionPxssh ('connection closed')
+ else: # Unexpected
+ self.close()
+ raise ExceptionPxssh ('unexpected login response')
+ if not self.sync_original_prompt():
+ self.close()
+ raise ExceptionPxssh ('could not synchronize with original prompt')
+ # We appear to be in.
+ # set shell prompt to something unique.
+ if auto_prompt_reset:
+ if not self.set_unique_prompt():
+ self.close()
+ raise ExceptionPxssh ('could not set shell prompt\n'+self.before)
+ return True
+
+ def logout (self):
+
+ """This sends exit to the remote shell. If there are stopped jobs then
+ this automatically sends exit twice. """
+
+ self.sendline("exit")
+ index = self.expect([EOF, "(?i)there are stopped jobs"])
+ if index==1:
+ self.sendline("exit")
+ self.expect(EOF)
+ self.close()
+
+ def prompt (self, timeout=-1):
+
+ """This matches the shell prompt. This is little more than a short-cut
+ to the expect() method. This returns True if the shell prompt was
+ matched. This returns False if a timeout was raised. Note that if you
+ called login() with auto_prompt_reset set to False then before calling
+ prompt() you must set the PROMPT attribute to a regex that prompt()
+ will use for matching the prompt. Calling prompt() will erase the
+ contents of the 'before' attribute even if no prompt is ever matched.
+ If timeout is not given or it is set to -1 then self.timeout is used.
+ """
+
+ if timeout == -1:
+ timeout = self.timeout
+ i = self.expect([self.PROMPT, TIMEOUT], timeout=timeout)
+ if i==1:
+ return False
+ return True
+
+ def set_unique_prompt (self):
+
+ """This sets the remote prompt to something more unique than # or $.
+ This makes it easier for the prompt() method to match the shell prompt
+ unambiguously. This method is called automatically by the login()
+ method, but you may want to call it manually if you somehow reset the
+ shell prompt. For example, if you 'su' to a different user then you
+ will need to manually reset the prompt. This sends shell commands to
+ the remote host to set the prompt, so this assumes the remote host is
+ ready to receive commands.
+
+ Alternatively, you may use your own prompt pattern. Just set the PROMPT
+ attribute to a regular expression that matches it. In this case you
+ should call login() with auto_prompt_reset=False; then set the PROMPT
+ attribute. After that the prompt() method will try to match your prompt
+ pattern."""
+
+ self.sendline ("unset PROMPT_COMMAND")
+ self.sendline (self.PROMPT_SET_SH) # sh-style
+ i = self.expect ([TIMEOUT, self.PROMPT], timeout=10)
+ if i == 0: # csh-style
+ self.sendline (self.PROMPT_SET_CSH)
+ i = self.expect ([TIMEOUT, self.PROMPT], timeout=10)
+ if i == 0:
+ return False
+ return True
+
+# vi:ts=4:sw=4:expandtab:ft=python:
diff -Nru catfish-0.6.3/catfish_lib/pexpect/screen.py catfish-0.8.2/catfish_lib/pexpect/screen.py
--- catfish-0.6.3/catfish_lib/pexpect/screen.py 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/catfish_lib/pexpect/screen.py 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,380 @@
+"""This implements a virtual screen. This is used to support ANSI terminal
+emulation. The screen representation and state is implemented in this class.
+Most of the methods are inspired by ANSI screen control codes. The ANSI class
+extends this class to add parsing of ANSI escape codes.
+
+$Id: screen.py 486 2007-07-13 01:04:16Z noah $
+"""
+
+import copy
+
+NUL = 0 # Fill character; ignored on input.
+ENQ = 5 # Transmit answerback message.
+BEL = 7 # Ring the bell.
+BS = 8 # Move cursor left.
+HT = 9 # Move cursor to next tab stop.
+LF = 10 # Line feed.
+VT = 11 # Same as LF.
+FF = 12 # Same as LF.
+CR = 13 # Move cursor to left margin or newline.
+SO = 14 # Invoke G1 character set.
+SI = 15 # Invoke G0 character set.
+XON = 17 # Resume transmission.
+XOFF = 19 # Halt transmission.
+CAN = 24 # Cancel escape sequence.
+SUB = 26 # Same as CAN.
+ESC = 27 # Introduce a control sequence.
+DEL = 127 # Fill character; ignored on input.
+SPACE = chr(32) # Space or blank character.
+
+def constrain (n, min, max):
+
+ """This returns a number, n constrained to the min and max bounds. """
+
+ if n < min:
+ return min
+ if n > max:
+ return max
+ return n
+
+class screen:
+
+ """This object maintains the state of a virtual text screen as a
+ rectangluar array. This maintains a virtual cursor position and handles
+ scrolling as characters are added. This supports most of the methods needed
+ by an ANSI text screen. Row and column indexes are 1-based (not zero-based,
+ like arrays). """
+
+ def __init__ (self, r=24,c=80):
+
+ """This initializes a blank scree of the given dimentions."""
+
+ self.rows = r
+ self.cols = c
+ self.cur_r = 1
+ self.cur_c = 1
+ self.cur_saved_r = 1
+ self.cur_saved_c = 1
+ self.scroll_row_start = 1
+ self.scroll_row_end = self.rows
+ self.w = [ [SPACE] * self.cols for c in range(self.rows)]
+
+ def __str__ (self):
+
+ """This returns a printable representation of the screen. The end of
+ each screen line is terminated by a newline. """
+
+ return '\n'.join ([ ''.join(c) for c in self.w ])
+
+ def dump (self):
+
+ """This returns a copy of the screen as a string. This is similar to
+ __str__ except that lines are not terminated with line feeds. """
+
+ return ''.join ([ ''.join(c) for c in self.w ])
+
+ def pretty (self):
+
+ """This returns a copy of the screen as a string with an ASCII text box
+ around the screen border. This is similar to __str__ except that it
+ adds a box. """
+
+ top_bot = '+' + '-'*self.cols + '+\n'
+ return top_bot + '\n'.join(['|'+line+'|' for line in str(self).split('\n')]) + '\n' + top_bot
+
+ def fill (self, ch=SPACE):
+
+ self.fill_region (1,1,self.rows,self.cols, ch)
+
+ def fill_region (self, rs,cs, re,ce, ch=SPACE):
+
+ rs = constrain (rs, 1, self.rows)
+ re = constrain (re, 1, self.rows)
+ cs = constrain (cs, 1, self.cols)
+ ce = constrain (ce, 1, self.cols)
+ if rs > re:
+ rs, re = re, rs
+ if cs > ce:
+ cs, ce = ce, cs
+ for r in range (rs, re+1):
+ for c in range (cs, ce + 1):
+ self.put_abs (r,c,ch)
+
+ def cr (self):
+
+ """This moves the cursor to the beginning (col 1) of the current row.
+ """
+
+ self.cursor_home (self.cur_r, 1)
+
+ def lf (self):
+
+ """This moves the cursor down with scrolling.
+ """
+
+ old_r = self.cur_r
+ self.cursor_down()
+ if old_r == self.cur_r:
+ self.scroll_up ()
+ self.erase_line()
+
+ def crlf (self):
+
+ """This advances the cursor with CRLF properties.
+ The cursor will line wrap and the screen may scroll.
+ """
+
+ self.cr ()
+ self.lf ()
+
+ def newline (self):
+
+ """This is an alias for crlf().
+ """
+
+ self.crlf()
+
+ def put_abs (self, r, c, ch):
+
+ """Screen array starts at 1 index."""
+
+ r = constrain (r, 1, self.rows)
+ c = constrain (c, 1, self.cols)
+ ch = str(ch)[0]
+ self.w[r-1][c-1] = ch
+
+ def put (self, ch):
+
+ """This puts a characters at the current cursor position.
+ """
+
+ self.put_abs (self.cur_r, self.cur_c, ch)
+
+ def insert_abs (self, r, c, ch):
+
+ """This inserts a character at (r,c). Everything under
+ and to the right is shifted right one character.
+ The last character of the line is lost.
+ """
+
+ r = constrain (r, 1, self.rows)
+ c = constrain (c, 1, self.cols)
+ for ci in range (self.cols, c, -1):
+ self.put_abs (r,ci, self.get_abs(r,ci-1))
+ self.put_abs (r,c,ch)
+
+ def insert (self, ch):
+
+ self.insert_abs (self.cur_r, self.cur_c, ch)
+
+ def get_abs (self, r, c):
+
+ r = constrain (r, 1, self.rows)
+ c = constrain (c, 1, self.cols)
+ return self.w[r-1][c-1]
+
+ def get (self):
+
+ self.get_abs (self.cur_r, self.cur_c)
+
+ def get_region (self, rs,cs, re,ce):
+
+ """This returns a list of lines representing the region.
+ """
+
+ rs = constrain (rs, 1, self.rows)
+ re = constrain (re, 1, self.rows)
+ cs = constrain (cs, 1, self.cols)
+ ce = constrain (ce, 1, self.cols)
+ if rs > re:
+ rs, re = re, rs
+ if cs > ce:
+ cs, ce = ce, cs
+ sc = []
+ for r in range (rs, re+1):
+ line = ''
+ for c in range (cs, ce + 1):
+ ch = self.get_abs (r,c)
+ line = line + ch
+ sc.append (line)
+ return sc
+
+ def cursor_constrain (self):
+
+ """This keeps the cursor within the screen area.
+ """
+
+ self.cur_r = constrain (self.cur_r, 1, self.rows)
+ self.cur_c = constrain (self.cur_c, 1, self.cols)
+
+ def cursor_home (self, r=1, c=1): # [{ROW};{COLUMN}H
+
+ self.cur_r = r
+ self.cur_c = c
+ self.cursor_constrain ()
+
+ def cursor_back (self,count=1): # [{COUNT}D (not confused with down)
+
+ self.cur_c = self.cur_c - count
+ self.cursor_constrain ()
+
+ def cursor_down (self,count=1): # [{COUNT}B (not confused with back)
+
+ self.cur_r = self.cur_r + count
+ self.cursor_constrain ()
+
+ def cursor_forward (self,count=1): # [{COUNT}C
+
+ self.cur_c = self.cur_c + count
+ self.cursor_constrain ()
+
+ def cursor_up (self,count=1): # [{COUNT}A
+
+ self.cur_r = self.cur_r - count
+ self.cursor_constrain ()
+
+ def cursor_up_reverse (self): # M (called RI -- Reverse Index)
+
+ old_r = self.cur_r
+ self.cursor_up()
+ if old_r == self.cur_r:
+ self.scroll_up()
+
+ def cursor_force_position (self, r, c): # [{ROW};{COLUMN}f
+
+ """Identical to Cursor Home."""
+
+ self.cursor_home (r, c)
+
+ def cursor_save (self): # [s
+
+ """Save current cursor position."""
+
+ self.cursor_save_attrs()
+
+ def cursor_unsave (self): # [u
+
+ """Restores cursor position after a Save Cursor."""
+
+ self.cursor_restore_attrs()
+
+ def cursor_save_attrs (self): # 7
+
+ """Save current cursor position."""
+
+ self.cur_saved_r = self.cur_r
+ self.cur_saved_c = self.cur_c
+
+ def cursor_restore_attrs (self): # 8
+
+ """Restores cursor position after a Save Cursor."""
+
+ self.cursor_home (self.cur_saved_r, self.cur_saved_c)
+
+ def scroll_constrain (self):
+
+ """This keeps the scroll region within the screen region."""
+
+ if self.scroll_row_start <= 0:
+ self.scroll_row_start = 1
+ if self.scroll_row_end > self.rows:
+ self.scroll_row_end = self.rows
+
+ def scroll_screen (self): # [r
+
+ """Enable scrolling for entire display."""
+
+ self.scroll_row_start = 1
+ self.scroll_row_end = self.rows
+
+ def scroll_screen_rows (self, rs, re): # [{start};{end}r
+
+ """Enable scrolling from row {start} to row {end}."""
+
+ self.scroll_row_start = rs
+ self.scroll_row_end = re
+ self.scroll_constrain()
+
+ def scroll_down (self): # D
+
+ """Scroll display down one line."""
+
+ # Screen is indexed from 1, but arrays are indexed from 0.
+ s = self.scroll_row_start - 1
+ e = self.scroll_row_end - 1
+ self.w[s+1:e+1] = copy.deepcopy(self.w[s:e])
+
+ def scroll_up (self): # M
+
+ """Scroll display up one line."""
+
+ # Screen is indexed from 1, but arrays are indexed from 0.
+ s = self.scroll_row_start - 1
+ e = self.scroll_row_end - 1
+ self.w[s:e] = copy.deepcopy(self.w[s+1:e+1])
+
+ def erase_end_of_line (self): # [0K -or- [K
+
+ """Erases from the current cursor position to the end of the current
+ line."""
+
+ self.fill_region (self.cur_r, self.cur_c, self.cur_r, self.cols)
+
+ def erase_start_of_line (self): # [1K
+
+ """Erases from the current cursor position to the start of the current
+ line."""
+
+ self.fill_region (self.cur_r, 1, self.cur_r, self.cur_c)
+
+ def erase_line (self): # [2K
+
+ """Erases the entire current line."""
+
+ self.fill_region (self.cur_r, 1, self.cur_r, self.cols)
+
+ def erase_down (self): # [0J -or- [J
+
+ """Erases the screen from the current line down to the bottom of the
+ screen."""
+
+ self.erase_end_of_line ()
+ self.fill_region (self.cur_r + 1, 1, self.rows, self.cols)
+
+ def erase_up (self): # [1J
+
+ """Erases the screen from the current line up to the top of the
+ screen."""
+
+ self.erase_start_of_line ()
+ self.fill_region (self.cur_r-1, 1, 1, self.cols)
+
+ def erase_screen (self): # [2J
+
+ """Erases the screen with the background color."""
+
+ self.fill ()
+
+ def set_tab (self): # H
+
+ """Sets a tab at the current position."""
+
+ pass
+
+ def clear_tab (self): # [g
+
+ """Clears tab at the current position."""
+
+ pass
+
+ def clear_all_tabs (self): # [3g
+
+ """Clears all tabs."""
+
+ pass
+
+# Insert line Esc [ Pn L
+# Delete line Esc [ Pn M
+# Delete character Esc [ Pn P
+# Scrolling region Esc [ Pn(top);Pn(bot) r
+
diff -Nru catfish-0.6.3/configure catfish-0.8.2/configure
--- catfish-0.6.3/configure 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/configure 2013-09-21 00:21:01.000000000 +0000
@@ -1,7 +1,7 @@
#!/bin/sh
APPNAME=catfish
-VERSION=0.6.2
+VERSION=0.8.2
PYTHON=python
diff -Nru catfish-0.6.3/control.in.in catfish-0.8.2/control.in.in
--- catfish-0.6.3/control.in.in 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/control.in.in 2013-09-21 00:21:01.000000000 +0000
@@ -3,7 +3,7 @@
Section: utils
Priority: optional
Architecture: all
-Depends: @python@-gi, gksu, findutils
+Depends: @python@-gi, findutils
Suggests: @python@-zeitgeist | zeitgeist
Installed-Size: 347
Maintainer: Sean Davis
diff -Nru catfish-0.6.3/data/ui/AboutCatfishDialog.ui catfish-0.8.2/data/ui/AboutCatfishDialog.ui
--- catfish-0.6.3/data/ui/AboutCatfishDialog.ui 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/data/ui/AboutCatfishDialog.ui 2013-09-21 00:21:01.000000000 +0000
@@ -9,7 +9,7 @@
catfishnormalCatfish
- 0.6.3
+ 0.8.2Copyright (C) 2007-2012 Christian Dywan <christian@twotoasts.de>
Copyright (C) 2012-2013 Sean Davis <smd.seandavis@gmail.com>Catfish is a versatile file searching tool.
diff -Nru catfish-0.6.3/data/ui/CatfishWindow.ui catfish-0.8.2/data/ui/CatfishWindow.ui
--- catfish-0.6.3/data/ui/CatfishWindow.ui 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/data/ui/CatfishWindow.ui 2013-09-21 00:21:01.000000000 +0000
@@ -3,81 +3,6 @@
-
FalseCatfish
@@ -140,7 +65,7 @@
Enter search terms and press ENTER•False
- gtk-find
+ edit-find-symbolicSearch terms
@@ -237,6 +162,7 @@
False16document-open-recent-symbolic
+ TrueFalse
@@ -287,6 +213,7 @@
False16document-open-recent-symbolic
+ TrueFalse
@@ -342,6 +269,7 @@
False16document-open-recent-symbolic
+ TrueFalse
@@ -385,6 +313,7 @@
False16document-properties-symbolic
+ True
@@ -454,6 +383,7 @@
False16text-x-generic-symbolic
+ TrueFalse
@@ -483,6 +413,53 @@
+
+ True
+ False
+ True
+ none
+
+
+
+ True
+ False
+ 3
+
+
+ True
+ False
+ 16
+ folder-symbolic
+ True
+
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ False
+ Folders
+
+
+ False
+ True
+ 1
+
+
+
+
+
+
+ False
+ True
+ 1
+
+
+ TrueTrue
@@ -500,6 +477,7 @@
False16camera-photo-symbolic
+ TrueFalse
@@ -525,7 +503,7 @@
FalseTrue
- 1
+ 2
@@ -546,6 +524,7 @@
False16audio-x-generic-symbolic
+ TrueFalse
@@ -571,7 +550,7 @@
FalseTrue
- 2
+ 3
@@ -592,6 +571,7 @@
False16video-x-generic-symbolic
+ TrueFalse
@@ -617,7 +597,7 @@
FalseTrue
- 3
+ 4
@@ -638,6 +618,7 @@
False16applications-utilities-symbolic
+ TrueFalse
@@ -663,7 +644,7 @@
FalseTrue
- 4
+ 5
@@ -688,6 +669,7 @@
False16list-add-symbolic
+ TrueFalse
@@ -730,6 +712,7 @@
False16document-properties-symbolic
+ True
@@ -743,7 +726,7 @@
FalseTrue
- 5
+ 6
@@ -1297,16 +1280,151 @@
button6
+
+ True
+ False
+ 16
+ folder-symbolic
+ True
+ 1
+
+
+ True
+ False
+ 16
+ edit-copy-symbolic
+ True
+ 1
+
+
+ True
+ False
+ 22
+ locked
+
+
+ True
+ False
+ 16
+ view-refresh-symbolic
+ True
+ 1
+
+
+ True
+ False
+ 16
+ gtk-about-symbolic
+ True
+
+
+ True
+ False
+
+
+
+ True
+ False
+ _Exact Match
+ True
+
+
+
+
+
+ True
+ False
+ _Hidden Files
+ True
+
+
+
+
+
+ True
+ False
+ _Fulltext Search
+ True
+
+
+
+
+
+ True
+ False
+
+
+
+
+ True
+ False
+ _Show Advanced Settings
+ True
+
+
+
+
+
+
+ True
+ False
+
+
+
+
+ _Update Search Index…
+ True
+ False
+ True
+ image2
+ False
+
+
+
+
+
+ _About
+ True
+ False
+ True
+ image20
+ False
+
+
+
+
+
+ True
+ False
+ 16
+ document-open-symbolic
+ True
+
+
+ True
+ False
+ 16
+ document-save-as-symbolic
+ True
+
+
+ True
+ False
+ 16
+ edit-delete-symbolic
+ True
+ TrueFalse
- gtk-open
+ _OpenTrueFalseTrue
- True
+ image21
+ False
@@ -1340,11 +1458,11 @@
- gtk-save-as
+ _Save as...TrueFalse
- True
- True
+ image22
+ False
@@ -1356,39 +1474,15 @@
- gtk-delete
+ _DeleteTrueFalse
- True
- True
+ image23
+ False
-
- True
- False
- gtk-directory
- 1
-
-
- True
- False
- gtk-copy
- 1
-
-
- True
- False
- 22
- locked
-
-
- True
- False
- gtk-refresh
- 1
- False
diff -Nru catfish-0.6.3/debian/changelog catfish-0.8.2/debian/changelog
--- catfish-0.6.3/debian/changelog 2013-04-11 22:19:00.000000000 +0000
+++ catfish-0.8.2/debian/changelog 2013-10-24 16:52:53.000000000 +0000
@@ -1,14 +1,16 @@
-catfish (0.6.3-1~raring~ppa1) raring; urgency=low
+catfish (0.8.2-1~raring~ppa1) raring; urgency=low
- * New upstream bugfix release, including:
- - Searching for * puts catfish into an infinite loop lp: #1165727
- - Case insensitive search in 'walk' method lp: #1166214
- - Check if dir exists before trying to list it lp: #1166079
- * Fixed debian and other packaging
-
- -- Sean Davis Thu, 11 Apr 2013 18:16:00 +0200
+ * New upstream release.
+
+ -- Liviu Andronic Thu, 24 Oct 2013 22:22:03 +0200
+
+catfish (0.6.3-1~precise~ppa1) precise; urgency=low
+
+ * New upstream release.
+
+ -- Liviu Andronic Sat, 20 Apr 2013 22:22:03 +0200
-catfish (0.6.1-1~raring~ppa1) raring; urgency=low
+catfish (0.6.1-1~precise~ppa1) precise; urgency=low
* New upstream release.
* Misc changes to debian/control.
diff -Nru catfish-0.6.3/debian/control catfish-0.8.2/debian/control
--- catfish-0.6.3/debian/control 2013-04-11 22:21:49.000000000 +0000
+++ catfish-0.8.2/debian/control 2013-03-07 21:16:51.000000000 +0000
@@ -8,7 +8,7 @@
python-distutils-extra (>= 2.10)
Standards-Version: 3.9.2
X-Python-Version: >= 2.6
-Homepage: https://launchpad.net/catfish-search
+Homepage: http://software.twotoasts.de/index.php?/pages/catfish_summary.html
Vcs-Svn: svn://svn.debian.org/python-apps/packages/catfish/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/catfish/trunk/
@@ -19,14 +19,15 @@
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
gir1.2-pango-1.0,
+ python-zeitgeist,
gir1.2-gdkpixbuf-2.0,
+ yelp,
gksu,
- locate
-Suggests: python-zeitgeist,
+ locate,
+ python-zeitgeist,
zeitgeist
Description: a versatile file searching tool
- Catfish is a handy file searching tool for Linux and UNIX. The interface is
- intentionally lightweight and simple, using only Gtk+3. You can configure
- it to your needs by using several command line options.
- .
- https://launchpad.net/catfish-search
+ Catfish is a search GUI powered by locate and find behind the scenes,
+ with autocompletion from Zeitgeist and locate. The advanced options
+ allow filtering by date and file type. The interface is intentionally
+ lightweight and simple, using only GTK+.
\ No newline at end of file
diff -Nru catfish-0.6.3/debian/patches/10Fix_makefile.dpatch catfish-0.8.2/debian/patches/10Fix_makefile.dpatch
--- catfish-0.6.3/debian/patches/10Fix_makefile.dpatch 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/debian/patches/10Fix_makefile.dpatch 2013-03-07 21:16:51.000000000 +0000
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-Fix_makefile.dpatch by Cody A.W. Somerville
+## Updated by Savvas Radevic
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix up Makefile.in (ex. Disable python compiling (we'll take care of that).
+## Also disable the creation of symlinks as we'll handle it in debian/rules
+## to ensure that it is done correctly.
+
+@DPATCH@
+--- catfish-0.3.2/Makefile.in 2009-01-13 17:40:41.000000000 +0100
++++ catfish-0.3.2/Makefile.in 2009-01-13 17:54:29.000000000 +0100
+@@ -5,7 +5,6 @@
+ DESTDIR=
+
+ all: $(LANGUAGE_FILES)
+- $(PYTHON) ./build.py build $(APPNAME)
+ sed -e s,%prefix%,$(PREFIX), $(APPNAME).in > $(APPNAME)
+ chmod +x $(APPNAME)
+
+@@ -18,25 +17,18 @@
+ install $(APPNAME) $(DESTDIR)/$(PREFIX)/bin
+
+ install -d $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
+- install $(APPNAME).pyc $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
+- install $(APPNAME).glade $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
++ install $(APPNAME).py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
++ install --mode=664 $(APPNAME).glade $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
+
+ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
+- install $(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
+- ln -sf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg
+-
+- install -d $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+- install AUTHORS $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+- install COPYING $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+- install ChangeLog $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+- install INSTALL $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+- install README $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
++ install --mode=664 $(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
++# ln -sf $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg
+
+ install -d $(DESTDIR)/$(PREFIX)/share/applications
+ install --mode=644 $(APPNAME).desktop $(DESTDIR)/$(PREFIX)/share/applications
+
+ cp -rf locale $(DESTDIR)/$(PREFIX)/share
+- ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale
++# ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale
+
+ uninstall:
+ rm -f $(DESTDIR)/$(PREFIX)/share/applications/$(APPNAME).desktop
+@@ -48,7 +40,6 @@
+
+ clean:
+ rm -Rf locale
+- rm -f *.pyc
+ rm -f $(APPNAME)
+ rm -f Makefile
+ rm -Rf deb
diff -Nru catfish-0.6.3/debian/watch catfish-0.8.2/debian/watch
--- catfish-0.6.3/debian/watch 2013-04-11 22:23:22.000000000 +0000
+++ catfish-0.8.2/debian/watch 2013-03-07 21:16:51.000000000 +0000
@@ -1,2 +1,2 @@
version=3
-https://launchpad.net/catfish-search .*/catfish-(.*)\.tar\.bz2
+http://software.twotoasts.de/index.php?/pages/catfish_summary.html .*/catfish-(.*)\.tar\.gz
diff -Nru catfish-0.6.3/po/be.po catfish-0.8.2/po/be.po
--- catfish-0.6.3/po/be.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/be.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
"PO-Revision-Date: 2012-08-20 20:56+0000\n"
"Last-Translator: Mikalai Udodau \n"
"Language-Team: Belarusian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr ""
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Увядзіце умовы пошуку і націсніце ЎВОД"
@@ -88,94 +89,98 @@
msgstr "Дакументы"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Выявы"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Музыка"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Відэа"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Праграмы"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Іншы"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Адмысловы абсяг часу"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr ""
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr ""
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Абнавіць індэкс пошуку"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr ""
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Скончана."
@@ -183,117 +188,166 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Перадпрагляд"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Назва файла"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Памер"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Размяшчэнне"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Апошнія змены"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "База звестак locate паспяхова абноўлена."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Здарылася памылка падчас абнаўлення locatedb."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr ""
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Ачысціць умовы пошуку"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr ""
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr ""
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr ""
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr ""
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr ""
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr ""
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Файлы не знойдзены."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Пошук \"%s\""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr ""
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Вынікі пошуку для \"%s\""
diff -Nru catfish-0.6.3/po/ca.po catfish-0.8.2/po/ca.po
--- catfish-0.6.3/po/ca.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/ca.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,52 +7,53 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-03-26 14:10+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-08-29 07:03+0000\n"
+"Last-Translator: Javier Antonio Nisa Avila \n"
"Language-Team: Catalan \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-31 05:26+0000\n"
+"X-Generator: Launchpad (build 16750)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Cerca de fitxers Catfish"
#: ../catfish.desktop.in.h:2
msgid "Search the file system"
-msgstr ""
+msgstr "Cerca en el sistema de fitxers"
#: ../data/ui/AboutCatfishDialog.ui.h:1
msgid "Catfish is a versatile file searching tool."
-msgstr ""
+msgstr "Catfish és una eina versàtil per cercar fitxers."
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:2
msgid "_Exact Match"
-msgstr ""
+msgstr "Coincidència _exacta"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:4
msgid "_Hidden Files"
-msgstr ""
+msgstr "Fitxers _ocults"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:6
msgid "_Fulltext Search"
-msgstr ""
+msgstr "Cerca de tot el _text"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:8
msgid "_Show Advanced Settings"
-msgstr ""
+msgstr "_Mostra paràmetres avançats"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:10
msgid "_Update Search Index…"
-msgstr ""
+msgstr "_Actualitza l’índex de cerca…"
#: ../data/ui/CatfishWindow.ui.h:11
msgid "Catfish"
@@ -60,240 +61,297 @@
#: ../data/ui/CatfishWindow.ui.h:12
msgid "Select a Directory"
-msgstr ""
+msgstr "Trieu un directori"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
-msgstr ""
+msgstr "Introduïu termes de cerca i premeu Retorn"
#: ../data/ui/CatfishWindow.ui.h:14
msgid "Any time"
-msgstr ""
+msgstr "Qualsevol moment"
#: ../data/ui/CatfishWindow.ui.h:15
msgid "This week"
-msgstr ""
+msgstr "Aquesta setmana"
#: ../data/ui/CatfishWindow.ui.h:16
msgid "Custom"
-msgstr ""
+msgstr "Personalitzat"
#: ../data/ui/CatfishWindow.ui.h:17
msgid "Modified"
-msgstr ""
+msgstr "Modificat"
#: ../data/ui/CatfishWindow.ui.h:18
msgid "Documents"
-msgstr ""
+msgstr "Documents"
#: ../data/ui/CatfishWindow.ui.h:19
-msgid "Images"
-msgstr ""
+msgid "Folders"
+msgstr "Carpetes"
#: ../data/ui/CatfishWindow.ui.h:20
-msgid "Music"
-msgstr ""
+msgid "Images"
+msgstr "Imatges"
#: ../data/ui/CatfishWindow.ui.h:21
-msgid "Videos"
-msgstr ""
+msgid "Music"
+msgstr "Música"
#: ../data/ui/CatfishWindow.ui.h:22
-msgid "Applications"
-msgstr ""
+msgid "Videos"
+msgstr "Vídeos"
#: ../data/ui/CatfishWindow.ui.h:23
-msgid "Other"
-msgstr ""
+msgid "Applications"
+msgstr "Programari"
#: ../data/ui/CatfishWindow.ui.h:24
-msgid "File Type"
-msgstr ""
+msgid "Other"
+msgstr "Altres"
#: ../data/ui/CatfishWindow.ui.h:25
-msgid "Custom Time Range"
-msgstr ""
+msgid "File Type"
+msgstr "Tipus de fitxer"
#: ../data/ui/CatfishWindow.ui.h:26
-msgid "Go to Today"
-msgstr ""
+msgid "Custom Time Range"
+msgstr "Personalitzar Temps"
#: ../data/ui/CatfishWindow.ui.h:27
-msgid "Start Date"
-msgstr ""
+msgid "Go to Today"
+msgstr "Anar a avui"
#: ../data/ui/CatfishWindow.ui.h:28
-msgid "End Date"
-msgstr ""
+msgid "Start Date"
+msgstr "Data Inici"
#: ../data/ui/CatfishWindow.ui.h:29
+msgid "End Date"
+msgstr "Data Final"
+
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
-msgstr ""
+msgstr "Tipus d'arxiu personalitzat"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr ""
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
-msgstr ""
+msgstr "Actualitzar indexació de busqueda"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
-msgstr ""
+msgstr "Desbloqueig"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr ""
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
-msgstr ""
+msgstr "Actualitzant base de dades..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
-msgstr ""
+msgstr "Fet"
#: ../catfish/__init__.py:35
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Incloir fitxers ocults"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr ""
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr ""
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
-msgstr ""
+msgstr "Mida"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
-msgstr ""
+msgstr "Ubicació"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
-msgstr ""
+msgstr "Darrera modificació"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Ha fallat l’autenticació."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr ""
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr ""
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr ""
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
-msgstr ""
+msgstr "Neteja els termes de cerca"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
-msgstr ""
+msgstr "Catfish no ha pogut trobar el gestor de fitxers predeterminat."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
-msgstr ""
+msgstr "No s’ha pogut obrir «%s»."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
-msgstr ""
+msgstr "No s’ha pogut desar «%s»."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
-msgstr ""
+msgstr "No s’ha pogut suprimir «%s»."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
-msgstr ""
+msgstr "Desa «%s» com…"
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
+"Esteu segur que voleu suprimir\n"
+"permanentment «%s»?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
+"Esteu segur que voleu suprimir\n"
+"permanentment els %i fitxers seleccionats?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
-msgstr ""
+msgstr "Si suprimiu un fitxer, es perdrà permanentment."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
+msgstr "No s’ha trobat cap fitxer."
+
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
-msgstr ""
+msgstr "S’han trobat %i fitxers."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
-msgstr ""
+msgstr "S’està cercant «%s»"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
-msgstr ""
+msgstr "S’està cercant…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
-msgstr ""
+msgstr "Resultats de la cerca «%s»"
diff -Nru catfish-0.6.3/po/catfish.pot catfish-0.8.2/po/catfish.pot
--- catfish-0.6.3/po/catfish.pot 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/catfish.pot 2013-09-21 00:21:01.000000000 +0000
@@ -1,20 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-30 11:44+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
-"Language: \n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr ""
@@ -59,8 +63,8 @@
msgid "Select a Directory"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr ""
@@ -85,94 +89,98 @@
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:19
-msgid "Images"
+msgid "Folders"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:20
-msgid "Music"
+msgid "Images"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:21
-msgid "Videos"
+msgid "Music"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:22
-msgid "Applications"
+msgid "Videos"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:23
-msgid "Other"
+msgid "Applications"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:24
-msgid "File Type"
+msgid "Other"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:25
-msgid "Custom Time Range"
+msgid "File Type"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:26
-msgid "Go to Today"
+msgid "Custom Time Range"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:27
-msgid "Start Date"
+msgid "Go to Today"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:28
-msgid "End Date"
+msgid "Start Date"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:29
+msgid "End Date"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr ""
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr ""
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr ""
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr ""
@@ -180,117 +188,166 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr ""
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr ""
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr ""
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr ""
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr ""
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr ""
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr ""
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr ""
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr ""
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr ""
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr ""
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr ""
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr ""
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr ""
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr ""
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr ""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr ""
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr ""
diff -Nru catfish-0.6.3/po/cs.po catfish-0.8.2/po/cs.po
--- catfish-0.6.3/po/cs.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/cs.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
"PO-Revision-Date: 2013-03-18 12:20+0000\n"
"Last-Translator: DAG Software \n"
"Language-Team: Czech \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Vyhledávač souborů Catfish"
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr "Vyber složku"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Zadejte hledané výrazy a stiskněte ENTER"
@@ -88,94 +89,98 @@
msgstr "Dokumenty"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Obrázky"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Hudba"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Videa"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Aplikace"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Jiný"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Typ souboru"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Vlastní časový rozsah"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Přejít na dnešek"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Počáteční datum"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Koncové datum"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr ""
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr ""
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "_Kopírovat umístění"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Aktualizovat vyhledávací index"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Odemknout"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr ""
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Hotovo."
@@ -183,117 +188,166 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Náhled"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Jméno souboru"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Velikost"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Umístění"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Naposledy změněno"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Ověření selhalo."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Lokační databáze úspěšně aktualizována."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Během aktualizace lokační databáze došlo k chybě."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr ""
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Ověření selhalo."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Vymazat vyhledávané výrazy"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr ""
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "\"%s\" nelze otevřít."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr ""
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr ""
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr ""
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Smažete-li soubor, bude nenávratně ztracen."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Nebyly nalezeny žádné soubory."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Vyhledává se \"%s\""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Hledá se…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Výsledek hledání \"%s\""
diff -Nru catfish-0.6.3/po/de.po catfish-0.8.2/po/de.po
--- catfish-0.6.3/po/de.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/de.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-02-24 01:01+0000\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-05-27 17:07+0000\n"
"Last-Translator: Simon Steinbeiß \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Catfish Dateisuche"
@@ -60,10 +61,10 @@
#: ../data/ui/CatfishWindow.ui.h:12
msgid "Select a Directory"
-msgstr ""
+msgstr "Verzeichnis wählen"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Suchbegriffen eingeben und ENTER drücken"
@@ -88,83 +89,87 @@
msgstr "Dokumente"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Bilder"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Musik"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Videos"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Anwendungen"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Andere"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Dateityp"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Zeitrahmen festlegen"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Zum heutigen Tag"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Anfangsdatum"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Enddatum"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr "Benutzerdefinierter Dateityp"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr "Bestehenden Dateityp wählen"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Dateiendung eingeben"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr "Im _Dateimanager anzeigen"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "_Kopiere Pfad"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Suchindex aktualisieren"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Entsprerren"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr "Suchindex aktualisieren"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
@@ -174,11 +179,11 @@
"aktualisiert werden.\n"
"Hierfür werden sudo (Administrator-)Rechte benötigt."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr "Datenbank wird aktualisiert..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Fertig."
@@ -186,78 +191,123 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr "Debug Nachrichten anzeigen (-vv debugs catfish_lib also)"
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Große Icons verwenden"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Vorschaubilder verwenden"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "Zeit in ISO Format anzeigen"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Suche in Ordner PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "FILEMAN als Dateimanager verwenden"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "WRAPPER verwenden, um Dateien zu öffnen"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "Exakte Suche"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Versteckte Dateien einbeziehen"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "Volltextsuche"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Vorschau"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Dateiname"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Größe"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Ort"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Zuletzt geändert"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Authentifizierung fehlgeschlagen."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Die locate Datenbank wurde erfolgreich aktualisiert."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr ""
"Während dem Aktualisieren der locate Datenbank ist ein Fehler aufgetreten."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr "Die Authentifizierung wurde durch den Benutzer abgebrochen."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Authentifizierung fehlgeschlagen."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Suchbegriffe löschen"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr "Catfish konnte den standardmäßigen Dateimanager nicht finden."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr "Catfish konnte den standardmäßigen open-wrapper nicht finden."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "\"%s\" konnte nicht geöffnet werden."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "\"%s\" konnte nicht gespeichert werden."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "\"%s\" konnte nicht gelöscht werden."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr "\"%s\" speichern als..."
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -266,7 +316,7 @@
"Soll \"%s\" wirklich dauerhaft \n"
"gelöscht werden?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -275,33 +325,37 @@
"Sollen die %i ausgewählten Dateien wirklich \n"
"dauerthaft gelöscht werden?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Wenn Sie eine Datei löschen, ist sie dauerhaft verloren."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Keine Dateien gefunden."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "1 Datei gefunden."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr "%i Dateien gefunden."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Suchen nach \"%s\""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Suche läuft …"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "Suche beenden"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Suchergebnisse für \"%s\""
diff -Nru catfish-0.6.3/po/el.po catfish-0.8.2/po/el.po
--- catfish-0.6.3/po/el.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/el.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
"PO-Revision-Date: 2013-02-24 00:59+0000\n"
"Last-Translator: Sean Davis \n"
"Language-Team: Greek \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr ""
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Εισάγετε τους όρους αναζήτησης και πιέστε το πλήκτρο ENTER"
@@ -88,94 +89,98 @@
msgstr "Έγγραφα"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Εικόνες"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Μουσική"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Βίντεο"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Εφαρμογές"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Άλλο"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Προσαρμοσμένο εύρος χρόνου"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr ""
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr ""
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Ενημέρωση ευρετηρίου αναζήτησης"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr ""
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Ολοκληρώθηκε."
@@ -183,118 +188,167 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Προεπισκόπιση"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Όνομα αρχείου"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Μέγεθος"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Τοποθεσία"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Τελευταία τροποποίηση"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Η βάση δεδομένων εντοπισμού ενημερώθηκε με επιτυχία."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr ""
"Παρουσιάστηκε σφάλμα κατά την ενημέρωση της βάσης δεδομένων εντοπισμού."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr ""
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Απαλοιφή όρων αναζήτησης"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr ""
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr ""
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr ""
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr ""
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr ""
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr ""
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Δεν βρέθηκαν αρχεία."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Αναζήτηση για \"%s\""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr ""
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Αποτελέσματα αναζήτησης για \"%s\""
diff -Nru catfish-0.6.3/po/en_AU.po catfish-0.8.2/po/en_AU.po
--- catfish-0.6.3/po/en_AU.po 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/po/en_AU.po 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,360 @@
+# English (Australia) translation for catfish-search
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the catfish-search package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: catfish-search\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-06-21 20:37+0000\n"
+"Last-Translator: Jackson Doak \n"
+"Language-Team: English (Australia) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
+msgid "Catfish File Search"
+msgstr "Catfish File Search"
+
+#: ../catfish.desktop.in.h:2
+msgid "Search the file system"
+msgstr "Search the file system"
+
+#: ../data/ui/AboutCatfishDialog.ui.h:1
+msgid "Catfish is a versatile file searching tool."
+msgstr "Catfish is a versatile file searching tool."
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:2
+msgid "_Exact Match"
+msgstr "_Exact Match"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:4
+msgid "_Hidden Files"
+msgstr "_Hidden Files"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:6
+msgid "_Fulltext Search"
+msgstr "_Fulltext Search"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:8
+msgid "_Show Advanced Settings"
+msgstr "_Show Advanced Settings"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:10
+msgid "_Update Search Index…"
+msgstr "_Update Search Index…"
+
+#: ../data/ui/CatfishWindow.ui.h:11
+msgid "Catfish"
+msgstr "Catfish"
+
+#: ../data/ui/CatfishWindow.ui.h:12
+msgid "Select a Directory"
+msgstr "Select a Directory"
+
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
+msgid "Enter search terms and press ENTER"
+msgstr "Enter search terms and press ENTER"
+
+#: ../data/ui/CatfishWindow.ui.h:14
+msgid "Any time"
+msgstr "Any time"
+
+#: ../data/ui/CatfishWindow.ui.h:15
+msgid "This week"
+msgstr "This week"
+
+#: ../data/ui/CatfishWindow.ui.h:16
+msgid "Custom"
+msgstr "Custom"
+
+#: ../data/ui/CatfishWindow.ui.h:17
+msgid "Modified"
+msgstr "Modified"
+
+#: ../data/ui/CatfishWindow.ui.h:18
+msgid "Documents"
+msgstr "Documents"
+
+#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
+msgid "Images"
+msgstr "Images"
+
+#: ../data/ui/CatfishWindow.ui.h:21
+msgid "Music"
+msgstr "Music"
+
+#: ../data/ui/CatfishWindow.ui.h:22
+msgid "Videos"
+msgstr "Videos"
+
+#: ../data/ui/CatfishWindow.ui.h:23
+msgid "Applications"
+msgstr "Applications"
+
+#: ../data/ui/CatfishWindow.ui.h:24
+msgid "Other"
+msgstr "Other"
+
+#: ../data/ui/CatfishWindow.ui.h:25
+msgid "File Type"
+msgstr "File Type"
+
+#: ../data/ui/CatfishWindow.ui.h:26
+msgid "Custom Time Range"
+msgstr "Custom Time Range"
+
+#: ../data/ui/CatfishWindow.ui.h:27
+msgid "Go to Today"
+msgstr "Go to Today"
+
+#: ../data/ui/CatfishWindow.ui.h:28
+msgid "Start Date"
+msgstr "Start Date"
+
+#: ../data/ui/CatfishWindow.ui.h:29
+msgid "End Date"
+msgstr "End Date"
+
+#: ../data/ui/CatfishWindow.ui.h:30
+msgid "Custom File Type"
+msgstr "Custom File Type"
+
+#. The "mimetype" is the file type of the file, such as "application/octet-stream"
+#: ../data/ui/CatfishWindow.ui.h:32
+msgid "Select existing mimetype"
+msgstr "Select existing mimetype"
+
+#. Enter "file extensions" such as .doc, .pdf
+#: ../data/ui/CatfishWindow.ui.h:34
+msgid "Enter file extensions"
+msgstr "Enter file extensions"
+
+#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
+#: ../data/ui/CatfishWindow.ui.h:36
+msgid "Show in _File Manager"
+msgstr "Show in _File Manager"
+
+#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
+#: ../data/ui/CatfishWindow.ui.h:38
+msgid "_Copy Location"
+msgstr "_Copy Location"
+
+#: ../data/ui/CatfishWindow.ui.h:39
+msgid "Update Search Index"
+msgstr "Update Search Index"
+
+#: ../data/ui/CatfishWindow.ui.h:40
+msgid "Unlock"
+msgstr "Unlock"
+
+#: ../data/ui/CatfishWindow.ui.h:41
+msgid "Update Search Index"
+msgstr "Update Search Index"
+
+#. The term "locate" is a commandline application, so it should not be translated.
+#: ../data/ui/CatfishWindow.ui.h:43
+msgid ""
+"To provide accurate results, the locate database needs to be "
+"refreshed.\n"
+"This requires sudo (admin) rights."
+msgstr ""
+"To provide accurate results, the locate database needs to be "
+"refreshed.\n"
+"This requires sudo (admin) rights."
+
+#: ../data/ui/CatfishWindow.ui.h:45
+msgid "Updating database…"
+msgstr "Updating database…"
+
+#: ../data/ui/CatfishWindow.ui.h:46
+msgid "Done."
+msgstr "Done."
+
+#: ../catfish/__init__.py:35
+msgid "Show debug messages (-vv debugs catfish_lib also)"
+msgstr "Show debug messages (-vv debugs catfish_lib also)"
+
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Use large icons"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Use thumbnails"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "Display time in ISO format"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Search in folder PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Use FILEMAN as filemanager"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "Use WRAPPER to open files"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "Perform exact match"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Include hidden files"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "Perform fulltext search"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
+msgid "Preview"
+msgstr "Preview"
+
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
+msgid "Filename"
+msgstr "Filename"
+
+#: ../catfish/CatfishWindow.py:246
+msgid "Size"
+msgstr "Size"
+
+#: ../catfish/CatfishWindow.py:248
+msgid "Location"
+msgstr "Location"
+
+#: ../catfish/CatfishWindow.py:250
+msgid "Last modified"
+msgstr "Last modified"
+
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Authentication failed."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
+msgid "Locate database updated successfully."
+msgstr "Locate database updated successfully."
+
+#: ../catfish/CatfishWindow.py:322
+msgid "An error occurred while updating locatedb."
+msgstr "An error occurred while updating locatedb."
+
+#: ../catfish/CatfishWindow.py:324
+msgid "User aborted authentication."
+msgstr "User aborted authentication."
+
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
+msgid "Clear search terms"
+msgstr "Clear search terms"
+
+#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
+#: ../catfish/CatfishWindow.py:693
+msgid "Catfish could not find the default file manager."
+msgstr "Catfish could not find the default file manager."
+
+#. Translators: This message will only appear when the default application for opening a file cannot be found.
+#: ../catfish/CatfishWindow.py:699
+msgid "Catfish could not find the default open wrapper."
+msgstr "Catfish could not find the default open wrapper."
+
+#: ../catfish/CatfishWindow.py:713
+#, python-format
+msgid "\"%s\" could not be opened."
+msgstr "\"%s\" could not be opened."
+
+#: ../catfish/CatfishWindow.py:756
+#, python-format
+msgid "\"%s\" could not be saved."
+msgstr "\"%s\" could not be saved."
+
+#: ../catfish/CatfishWindow.py:781
+#, python-format
+msgid "\"%s\" could not be deleted."
+msgstr "\"%s\" could not be deleted."
+
+#: ../catfish/CatfishWindow.py:793
+#, python-format
+msgid "Save \"%s\" as…"
+msgstr "Save \"%s\" as…"
+
+#: ../catfish/CatfishWindow.py:820
+#, python-format
+msgid ""
+"Are you sure that you want to \n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Are you sure that you want to \n"
+"permanently delete \"%s\"?"
+
+#: ../catfish/CatfishWindow.py:824
+#, python-format
+msgid ""
+"Are you sure that you want to \n"
+"permanently delete the %i selected files?"
+msgstr ""
+"Are you sure that you want to \n"
+"permanently delete the %i selected files?"
+
+#: ../catfish/CatfishWindow.py:827
+msgid "If you delete a file, it is permanently lost."
+msgstr "If you delete a file, it is permanently lost."
+
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
+msgid "No files found."
+msgstr "No files found."
+
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "1 file found."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
+#, python-format
+msgid "%i files found."
+msgstr "%i files found."
+
+#: ../catfish/CatfishWindow.py:1190
+#, python-format
+msgid "Searching for \"%s\""
+msgstr "Searching for \"%s\""
+
+#: ../catfish/CatfishWindow.py:1192
+msgid "Searching…"
+msgstr "Searching…"
+
+#: ../catfish/CatfishWindow.py:1196
+msgid "Stop Search"
+msgstr "Stop Search"
+
+#: ../catfish/CatfishWindow.py:1284
+#, python-format
+msgid "Search results for \"%s\""
+msgstr "Search results for \"%s\""
diff -Nru catfish-0.6.3/po/es.po catfish-0.8.2/po/es.po
--- catfish-0.6.3/po/es.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/es.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-03-02 10:39+0000\n"
-"Last-Translator: Sean Davis \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-08-27 23:05+0000\n"
+"Last-Translator: Adolfo Jayme Barrientos \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-31 05:26+0000\n"
+"X-Generator: Launchpad (build 16750)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Buscador de archivos Catfish"
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr "Seleccione un directorio"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Escriba términos de búsqueda y oprima INTRO"
@@ -88,83 +89,87 @@
msgstr "Documentos"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr "Carpetas"
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Imágenes"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Música"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Vídeos"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Aplicaciones"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Otro"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Tipo de archivo"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Intervalo de tiempo personalizado"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Ir a hoy"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Fecha de inicio"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Fecha de finalización"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr "Tipo de archivo personalizado"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr "Seleccione un tipo MIME existente"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Escriba las extensiones de archivo"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr "Mostrar en el _gestor de archivos"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "_Copiar la ubicación"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Actualizar el índice de búsqueda"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Desbloquear"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr "Actualizar el índice de búsqueda"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
@@ -174,11 +179,11 @@
"locate.\n"
"Esto requiere permisos de sudo (administrador)."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr "Actualizando la base de datos…"
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Hecho."
@@ -186,77 +191,122 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr "Mostrar mensajes de depuración (-vv depura catfish_lib también)"
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Usar iconos grandes"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Usar miniaturas"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "Mostrar la hora en formato ISO"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Buscar en la carpeta PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Usar FILEMAN como el gestor de archivos"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "Usar WRAPPER para abrir los archivos"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "Realizar coincidencia exacta"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Incluir archivos ocultos"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "Realizar búsqueda de texto completo"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr "%s (codif. no válida)"
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Previsualización"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Nombre de archivo"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Tamaño"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Ubicación"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Última modificación"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Falló la autenticación."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "La base de datos locate se ha actualizado correctamente."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Se produjo un error al actualizar la base de datos locate."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr "El usuario canceló la autenticación."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Falló la autenticación."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Borrar términos de la búsqueda"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr "Catfish no pudo encontrar el gestor de archivos predeterminado."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr "Catfish no pudo encontrar la aplicación de apertura predeterminada."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "No se pudo abrir «%s»."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "No se pudo guardar «%s»."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "No se pudo eliminar «%s»."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr "Guardar «%s» como…"
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -265,7 +315,7 @@
"¿Está seguro de que quiere eliminar \n"
"permanentemente «%s»?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -274,33 +324,37 @@
"¿Está seguro de que quiere eliminar \n"
"permanentemente los %i archivos seleccionados?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Si elimina un archivo, lo perderá permanentemente."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "No se han encontrado archivos."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "Se ha encontrado 1 archivo."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
-msgstr "%i archivos encontrados."
+msgstr "Se han encontrado %i archivos."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Buscando «%s»"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Buscando…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "Detener la búsqueda"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Resultados de búsqueda para «%s»"
diff -Nru catfish-0.6.3/po/eu.po catfish-0.8.2/po/eu.po
--- catfish-0.6.3/po/eu.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/eu.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
"PO-Revision-Date: 2013-01-11 19:52+0000\n"
"Last-Translator: Asier Iturralde Sarasola \n"
"Language-Team: Basque \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr ""
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr ""
@@ -88,94 +89,98 @@
msgstr "Dokumentuak"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Irudiak"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Musika"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Bideoak"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Aplikazioak"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr ""
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr ""
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr ""
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Eginda."
@@ -183,117 +188,166 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Aurrebista"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Fitxategi-izena"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Tamaina"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Kokapena"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Azken aldaketa"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr ""
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr ""
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr ""
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr ""
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr ""
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr ""
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr ""
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr ""
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr ""
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr ""
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Ez da fitxategirik aurkitu."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr ""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr ""
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr ""
diff -Nru catfish-0.6.3/po/fi.po catfish-0.8.2/po/fi.po
--- catfish-0.6.3/po/fi.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/fi.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-02-24 01:01+0000\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-05-27 16:36+0000\n"
"Last-Translator: Pasi Lallinaho \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Catfish -tiedostonhaku"
@@ -60,10 +61,10 @@
#: ../data/ui/CatfishWindow.ui.h:12
msgid "Select a Directory"
-msgstr ""
+msgstr "Valitse hakemisto"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Syötä hakusanat ja paina ENTER"
@@ -88,83 +89,87 @@
msgstr "Asiakirjat"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Kuvat"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Musiikki"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Videot"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Sovellukset"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Muu"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Tiedostotyyppi"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Mukautettu aikaväli"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Siirry tähän päivään"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Aloituspäivä"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Päättymispäivä"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr "Mukautettu tiedostotyyppi"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr "Valitse olemassa oleva MIME-tyyppi"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Syötä tiedostotunnisteet"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr "_Näytä tiedostoselaimessa"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "Kopioi _sijainti"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Päivitä hakuindeksi"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Avaa lukitus"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr "Päivitä hakuindeksi"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
@@ -173,11 +178,11 @@
"Saadaksesi täsmällisiä tuloksia, locate -tietokanta pitää päivittää.\n"
"Tämä vaatii sudo (järjestelmänvalvoja) -oikeudet."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr "Päivitetään tietokantaa..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Valmis."
@@ -186,77 +191,122 @@
msgstr ""
"Näytä virheilmoitukset (-vv näyttää myös catfish_libin virheilmoitukset)"
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Käytä suuria kuvakkeita"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Käytä esikatselua"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "Näytä aika ISO-muodossa"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Hae hakemistosta PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Käytä sovellusta FILEMAN tiedostoselaimena"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "Käytä sovellusta WRAPPER tiedostojen avaamiseen"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "Suorita tarkka haku"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Sisällytä piilotiedostot"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "Suorita kokotekstihaku"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Esikatselu"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Tiedoston nimi"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Koko"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Sijainti"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Viimeksi muokattu"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Tunnistus epäonnistui."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Locate -tietokanta päivitettiin onnistuneesti."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Virhe päivitettäessä locate -tietokantaa."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr "Käyttäjä keskeytti tunnistuksen."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Tunnistus epäonnistui."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Tyhjennä hakusanat"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr "Catfish ei löytänyt oletustiedostoselainta."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr "Catfish ei löytänyt oletusohjelmaa tiedoston avaamiseen."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "Tiedostoa \"%s\" ei voitu avata."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "Tiedostoa \"%s\" ei voitu tallentaa."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "Tiedostoa \"%s\" ei voitu poistaa."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr "Tallenna \"%s\" nimellä..."
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -265,7 +315,7 @@
"Oletko varma että haluat\n"
"poistaa \"%s\" pysyvästi?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -274,33 +324,37 @@
"Oletko varma että haluat\n"
"poistaa %i tiedostoa pysyvästi?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Jos poistat tiedoston, sitä ei voi palauttaa."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Tiedostoja ei löytynyt."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "Löydettiin 1 tiedosto."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
-msgstr "%i tiedostoa löytyi."
+msgstr "Löydettiin %i tiedostoa."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Etsitään \"%s\""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Haetaan…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "Keskeytä haku"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Hakutulokset haulle \"%s\""
diff -Nru catfish-0.6.3/po/fr.po catfish-0.8.2/po/fr.po
--- catfish-0.6.3/po/fr.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/fr.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-03-21 20:35+0000\n"
-"Last-Translator: Gaëtan Godineau \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-07-06 16:26+0000\n"
+"Last-Translator: Teromene \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Recherche de fichiers Catfish"
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr "Sélectionnez un répertoire"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Entrez les termes recherchés et appuyez sur ENTREE"
@@ -88,83 +89,87 @@
msgstr "Documents"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Images"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Musique"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Vidéos"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Applications"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Autre"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Type de fichier"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Période personnalisée"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Aller à aujourd'hui"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Date de début"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Date de fin"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr "Type de fichier personnalisé"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr "Sélectionner un type MIME existant"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Entrer les extensions de fichiers"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr "Montrer dans le _Gestionnaire de fichier"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "_Copier l'emplacement"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Mettre à jour l'index"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Déverrouiller"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr "Mettre à jour l'index"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
@@ -174,11 +179,11 @@
"être rafraîchie.\n"
"Ceci nécessite les droits administrateur."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr "Mise à jour de la base de données..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Terminé."
@@ -186,77 +191,122 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr "Montrer les messages de débogage (dont -vv debugs catfish_lib)"
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Utiliser de grandes icônes"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Utiliser des miniatures"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Rechercher dans le dossier PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Utiliser FILEMAN comme gestionnaire de fichiers"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Inclure les fichiers cachés"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Aperçu"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Nom de fichier"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Taille"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Emplacement"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Dernière modification"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Échec de l'authentification."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "La base de données locate a été mise à jour."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Une erreur est survenue pendant la mise à jour de locatedb."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr "Authentification annulée par l'utilisateur."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Échec de l'authentification."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Effacer les termes de recherche"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr "Catfish n'a pas trouvé le gestionnaire de fichiers par défaut."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr "Catfish n'a pas trouvé l'application par défaut."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "Impossible d'ouvrir \"%s\"."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "Impossible d'enregistrer \"%s\"."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "Impossible de supprimer \"%s\"."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr "Enregistrer \"%s\" sous..."
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -265,7 +315,7 @@
"Êtes-vous sûr de vouloir\n"
"supprimer définitivement \"%s\" ?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -274,33 +324,37 @@
"Êtes-vous sûr de vouloir\n"
"supprimer définitivement les \"%i\" fichiers sélectionnés ?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Si vous supprimez un fichier, il sera définitivement perdu."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Aucun fichier trouvé."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "1 fichier trouvé"
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr "%i fichiers trouvés"
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Recherche de \"%s\""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Recherche en cours…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "Arrêter la recherche"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Rechercher les résultats pour \"%s\""
diff -Nru catfish-0.6.3/po/hu.po catfish-0.8.2/po/hu.po
--- catfish-0.6.3/po/hu.po 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/po/hu.po 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,364 @@
+# Ukrainian translation for catfish-search
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the catfish-search package.
+#
+# FIRST AUTHOR , 2013.
+# Gabor Kelemen , 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: catfish-search\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-04-17 01:12+0000\n"
+"Last-Translator: Gabor Kelemen \n"
+"Language-Team: Ukrainian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+"Language: uk\n"
+
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
+msgid "Catfish File Search"
+msgstr "Catfish fájlkereső"
+
+#: ../catfish.desktop.in.h:2
+msgid "Search the file system"
+msgstr "Keresés a fájlrendszerben"
+
+#: ../data/ui/AboutCatfishDialog.ui.h:1
+msgid "Catfish is a versatile file searching tool."
+msgstr "A Catfish egy rugalmas fájlkereső eszköz."
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:2
+msgid "_Exact Match"
+msgstr "_Pontos egyezés"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:4
+msgid "_Hidden Files"
+msgstr "_Rejtett fájlok"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:6
+msgid "_Fulltext Search"
+msgstr "_Teljes szöveges keresés"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:8
+msgid "_Show Advanced Settings"
+msgstr "_Speciális beállítások megjelenítése"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:10
+msgid "_Update Search Index…"
+msgstr "_Keresési index frissítése"
+
+#: ../data/ui/CatfishWindow.ui.h:11
+msgid "Catfish"
+msgstr "Catfish"
+
+#: ../data/ui/CatfishWindow.ui.h:12
+msgid "Select a Directory"
+msgstr "Könyvtár kiválasztása"
+
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
+msgid "Enter search terms and press ENTER"
+msgstr "Adja meg a keresési kifejezéseket, majd nyomja meg az Entert"
+
+#: ../data/ui/CatfishWindow.ui.h:14
+msgid "Any time"
+msgstr "Bármikor"
+
+#: ../data/ui/CatfishWindow.ui.h:15
+msgid "This week"
+msgstr "Ezen a héten"
+
+#: ../data/ui/CatfishWindow.ui.h:16
+msgid "Custom"
+msgstr "Egyéni"
+
+#: ../data/ui/CatfishWindow.ui.h:17
+msgid "Modified"
+msgstr "Módosítás"
+
+#: ../data/ui/CatfishWindow.ui.h:18
+msgid "Documents"
+msgstr "Dokumentumok"
+
+#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
+msgid "Images"
+msgstr "Képek"
+
+#: ../data/ui/CatfishWindow.ui.h:21
+msgid "Music"
+msgstr "Zene"
+
+#: ../data/ui/CatfishWindow.ui.h:22
+msgid "Videos"
+msgstr "Videók"
+
+#: ../data/ui/CatfishWindow.ui.h:23
+msgid "Applications"
+msgstr "Alkalmazások"
+
+#: ../data/ui/CatfishWindow.ui.h:24
+msgid "Other"
+msgstr "Egyéb"
+
+#: ../data/ui/CatfishWindow.ui.h:25
+msgid "File Type"
+msgstr "Fájltípus"
+
+#: ../data/ui/CatfishWindow.ui.h:26
+msgid "Custom Time Range"
+msgstr "Egyéni időintervallum"
+
+#: ../data/ui/CatfishWindow.ui.h:27
+msgid "Go to Today"
+msgstr "Ugrás a mai naphoz"
+
+#: ../data/ui/CatfishWindow.ui.h:28
+msgid "Start Date"
+msgstr "Kezdő dátum"
+
+#: ../data/ui/CatfishWindow.ui.h:29
+msgid "End Date"
+msgstr "Záró dátum"
+
+#: ../data/ui/CatfishWindow.ui.h:30
+msgid "Custom File Type"
+msgstr "Egyéni fájltípus"
+
+#. The "mimetype" is the file type of the file, such as "application/octet-stream"
+#: ../data/ui/CatfishWindow.ui.h:32
+msgid "Select existing mimetype"
+msgstr "Létező MIME-típus kiválasztása"
+
+#. Enter "file extensions" such as .doc, .pdf
+#: ../data/ui/CatfishWindow.ui.h:34
+msgid "Enter file extensions"
+msgstr "Adja meg a fájlkiterjesztéseket"
+
+#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
+#: ../data/ui/CatfishWindow.ui.h:36
+msgid "Show in _File Manager"
+msgstr "Megjelenítés a _fájlkezelőben"
+
+#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
+#: ../data/ui/CatfishWindow.ui.h:38
+msgid "_Copy Location"
+msgstr "Hely _másolása"
+
+#: ../data/ui/CatfishWindow.ui.h:39
+msgid "Update Search Index"
+msgstr "Keresési index frissítése"
+
+#: ../data/ui/CatfishWindow.ui.h:40
+msgid "Unlock"
+msgstr "Feloldás"
+
+#: ../data/ui/CatfishWindow.ui.h:41
+msgid "Update Search Index"
+msgstr "Keresési index frissítése"
+
+#. The term "locate" is a commandline application, so it should not be translated.
+#: ../data/ui/CatfishWindow.ui.h:43
+msgid ""
+"To provide accurate results, the locate database needs to be "
+"refreshed.\n"
+"This requires sudo (admin) rights."
+msgstr ""
+"Pontos eredmények érdekében frissíteni kell a locate adatbázist.\n"
+"Ehhez rendszergazdai jogok szükségesek."
+
+#: ../data/ui/CatfishWindow.ui.h:45
+msgid "Updating database…"
+msgstr "Adatbázis frissítése…"
+
+#: ../data/ui/CatfishWindow.ui.h:46
+msgid "Done."
+msgstr "Kész."
+
+#: ../catfish/__init__.py:35
+msgid "Show debug messages (-vv debugs catfish_lib also)"
+msgstr ""
+"Hibakereső üzenetek megjelenítése (a -vv a catfish_lib hibaüzeneteit is "
+"megjeleníti)"
+
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
+msgid "Preview"
+msgstr "Előnézet"
+
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
+msgid "Filename"
+msgstr "Fájlnév"
+
+#: ../catfish/CatfishWindow.py:246
+msgid "Size"
+msgstr "Méret"
+
+#: ../catfish/CatfishWindow.py:248
+msgid "Location"
+msgstr "Hely"
+
+#: ../catfish/CatfishWindow.py:250
+msgid "Last modified"
+msgstr "Utolsó módosítás"
+
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "A hitelesítés meghiúsult."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
+msgid "Locate database updated successfully."
+msgstr "A locate adatbázis sikeresen frissült."
+
+#: ../catfish/CatfishWindow.py:322
+msgid "An error occurred while updating locatedb."
+msgstr "Hiba történt a locatedb frissítése közben."
+
+#: ../catfish/CatfishWindow.py:324
+msgid "User aborted authentication."
+msgstr "A felhasználó megszakította a hitelesítést."
+
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
+msgid "Clear search terms"
+msgstr "Keresési kifejezések törlése"
+
+#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
+#: ../catfish/CatfishWindow.py:693
+msgid "Catfish could not find the default file manager."
+msgstr "A Catfish nem találja az alapértelmezett fájlkezelőt."
+
+#. Translators: This message will only appear when the default application for opening a file cannot be found.
+#: ../catfish/CatfishWindow.py:699
+msgid "Catfish could not find the default open wrapper."
+msgstr ""
+"A Catfish nem találja az alapértelmezett alkalmazást a fájl megnyitásához."
+
+#: ../catfish/CatfishWindow.py:713
+#, python-format
+msgid "\"%s\" could not be opened."
+msgstr "„%s” nem nyitható meg."
+
+#: ../catfish/CatfishWindow.py:756
+#, python-format
+msgid "\"%s\" could not be saved."
+msgstr "„%s” nem menthető."
+
+#: ../catfish/CatfishWindow.py:781
+#, python-format
+msgid "\"%s\" could not be deleted."
+msgstr "„%s” nem törölhető."
+
+#: ../catfish/CatfishWindow.py:793
+#, python-format
+msgid "Save \"%s\" as…"
+msgstr "„%s” mentése másként…"
+
+#: ../catfish/CatfishWindow.py:820
+#, python-format
+msgid ""
+"Are you sure that you want to \n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Biztos, hogy véglegesen törölni szeretné \n"
+"a(z) „%s” fájlt?"
+
+#: ../catfish/CatfishWindow.py:824
+#, python-format
+msgid ""
+"Are you sure that you want to \n"
+"permanently delete the %i selected files?"
+msgstr ""
+"Biztos, hogy véglegesen törölni szeretné\n"
+"a kijelölt %i fájlt?"
+
+#: ../catfish/CatfishWindow.py:827
+msgid "If you delete a file, it is permanently lost."
+msgstr "Ha töröl egy fájlt, az véglegesen elvész."
+
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
+msgid "No files found."
+msgstr "Nem találhatók fájlok."
+
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
+#, python-format
+msgid "%i files found."
+msgstr "%i fájl található."
+
+#: ../catfish/CatfishWindow.py:1190
+#, python-format
+msgid "Searching for \"%s\""
+msgstr "„%s” keresése"
+
+#: ../catfish/CatfishWindow.py:1192
+msgid "Searching…"
+msgstr "Keresés…"
+
+#: ../catfish/CatfishWindow.py:1196
+msgid "Stop Search"
+msgstr "Keresés leállítása"
+
+#: ../catfish/CatfishWindow.py:1284
+#, python-format
+msgid "Search results for \"%s\""
+msgstr "Találatok erre: „%s”"
diff -Nru catfish-0.6.3/po/id.po catfish-0.8.2/po/id.po
--- catfish-0.6.3/po/id.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/id.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
"PO-Revision-Date: 2013-03-17 01:40+0000\n"
"Last-Translator: Viko Adi Rahmawan \n"
"Language-Team: Indonesian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Catfish si pencari berkas"
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr "Pilih Direktori"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr ""
@@ -88,94 +89,98 @@
msgstr "Dokumen"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Gambar"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Musik"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Video"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Aplikasi"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Lainnya"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Tipe Berkas"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Hari Ini"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Mulai"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Hingga"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr ""
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr ""
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Masukkan ekstensi berkas"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr "Tampilkan di Pengelola Berkas"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "_Salin Lokasi"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr ""
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr ""
@@ -183,117 +188,166 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr ""
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr ""
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr ""
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr ""
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr ""
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr ""
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr ""
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr ""
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr ""
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr ""
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr ""
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr ""
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr ""
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr ""
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr ""
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr ""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr ""
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr ""
diff -Nru catfish-0.6.3/po/it.po catfish-0.8.2/po/it.po
--- catfish-0.6.3/po/it.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/it.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,23 +7,24 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-02-20 23:30+0000\n"
-"Last-Translator: Matteo Costa \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-08-08 10:16+0000\n"
+"Last-Translator: Cristian Marchi \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
-msgstr ""
+msgstr "Catfish ricerca di file"
#: ../catfish.desktop.in.h:2
msgid "Search the file system"
-msgstr "Cerca nel filesystem"
+msgstr "Cerca nel file system"
#: ../data/ui/AboutCatfishDialog.ui.h:1
msgid "Catfish is a versatile file searching tool."
@@ -32,27 +33,27 @@
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:2
msgid "_Exact Match"
-msgstr ""
+msgstr "Corrispondenza _esatta"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:4
msgid "_Hidden Files"
-msgstr ""
+msgstr "File _nascosti"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:6
msgid "_Fulltext Search"
-msgstr ""
+msgstr "Ricerca co_mpleta"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:8
msgid "_Show Advanced Settings"
-msgstr ""
+msgstr "Mostra impostazioni avan_zate"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:10
msgid "_Update Search Index…"
-msgstr ""
+msgstr "Aggiorna in_dice di ricerca..."
#: ../data/ui/CatfishWindow.ui.h:11
msgid "Catfish"
@@ -60,12 +61,12 @@
#: ../data/ui/CatfishWindow.ui.h:12
msgid "Select a Directory"
-msgstr ""
+msgstr "Selezionare una cartella"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
-msgstr "Inserisci i termini di ricerca e premi ENTER"
+msgstr "Inserire i termini da ricercare e premere INVIO"
#: ../data/ui/CatfishWindow.ui.h:14
msgid "Any time"
@@ -73,227 +74,289 @@
#: ../data/ui/CatfishWindow.ui.h:15
msgid "This week"
-msgstr ""
+msgstr "Questa settimana"
#: ../data/ui/CatfishWindow.ui.h:16
msgid "Custom"
-msgstr ""
+msgstr "Personalizzato"
#: ../data/ui/CatfishWindow.ui.h:17
msgid "Modified"
-msgstr ""
+msgstr "Modificato"
#: ../data/ui/CatfishWindow.ui.h:18
msgid "Documents"
msgstr "Documenti"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr "Cartelle"
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Immagini"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Musica"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Video"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Programmi"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Altro"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
-msgstr ""
+msgstr "Tipo di file"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Intervallo di tempo personalizzato"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
-msgstr ""
+msgstr "Vai a oggi"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
-msgstr ""
+msgstr "Data iniziale"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
-msgstr ""
+msgstr "Data finale"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
-msgstr ""
+msgstr "Tipo di file personalizzato"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
-msgstr ""
+msgstr "Selezione tipo mime esistente"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
-msgstr ""
+msgstr "Inserire l'estensione del file"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
-msgstr ""
+msgstr "Mostra nel _gestore di file"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
-msgstr ""
+msgstr "_Copia posizione"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Aggiorna l'indice di ricerca"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
-msgstr ""
+msgstr "Scarica"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
-msgstr ""
+msgstr "Aggiorna indice di ricerca"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
+"Per ottenere risultati accurati, il database delle posizioni deve "
+"essere aggiornato.\n"
+"Per questa operazione sono necessari i diritti di amministratore (sudo)"
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
-msgstr ""
+msgstr "Aggiornamento database in corso..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Finito."
#: ../catfish/__init__.py:35
msgid "Show debug messages (-vv debugs catfish_lib also)"
+msgstr "Mostra messaggi di debug (-vv debugs catfish_lib)"
+
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Usa icone grandi"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Usa miniature"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "Mostra l'ora in formato ISO"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Cerca nella cartella PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Usa FILEMAN come gestore dei file"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "Usa WRAPPER per aprire i file"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "Esegue una corrispondenza esatta"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Include i file nascosti"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "Esegue una ricerca completa"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Anteprima"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Nome file"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Dimensione"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Posizione"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
-msgstr "Ultimo modificato"
+msgstr "Ultima modifica"
+
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Autenticazione non riuscita."
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
-msgstr ""
+msgstr "Database delle posizioni aggiornato."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr ""
+"Si è verificato un errore nell'aggiornamento del database delle posizioni"
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
-msgstr ""
+msgstr "Autenticazione interrotta dall'utente"
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Cancella i termini di ricerca"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
-msgstr ""
+msgstr "Catfish non riesce a trovare il gestore di file predefinito"
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
+"Catfish non riesce a trovare l'applicazione predefinita per l'apertura"
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
-msgstr ""
+msgstr "Impossibile aprire «%s»."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
-msgstr ""
+msgstr "Impossibile salvare «%s»."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
-msgstr ""
+msgstr "Impossibile eliminare «%s»."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
-msgstr ""
+msgstr "Salva «%s» come..."
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
+"Eliminare davvero «%s» in\n"
+"modo permanente?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
+"Eliminare davvero i %i file selezionati\n"
+"in modo permanente?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
-msgstr ""
+msgstr "Se si elimina un file non sarà più recuperabile."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Nessun file trovato."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "Trovato 1 file."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
-msgstr ""
+msgstr "Trovati %i file."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
-msgstr "Ricerca di \"%s\""
+msgstr "Ricerca di «%s»"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
-msgstr ""
+msgstr "Ricerca in corso..."
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
-msgstr ""
+msgstr "Interrompi ricerca"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
-msgstr "Risultati della ricerca per \"%s\""
+msgstr "Risultati della ricerca di «%s»"
diff -Nru catfish-0.6.3/po/ja.po catfish-0.8.2/po/ja.po
--- catfish-0.6.3/po/ja.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/ja.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,293 +7,353 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2012-07-31 16:45+0000\n"
-"Last-Translator: Ryan Hagood \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-06-10 09:41+0000\n"
+"Last-Translator: o-157 \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
-msgstr ""
+msgstr "Catfish File Search"
#: ../catfish.desktop.in.h:2
msgid "Search the file system"
-msgstr ""
+msgstr "ファイルシステムを検索"
#: ../data/ui/AboutCatfishDialog.ui.h:1
msgid "Catfish is a versatile file searching tool."
-msgstr ""
+msgstr "Catfishは多目的のファイル検索ツールです。"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:2
msgid "_Exact Match"
-msgstr ""
+msgstr "完全一致(_E)"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:4
msgid "_Hidden Files"
-msgstr ""
+msgstr "隠しファイル(_H)"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:6
msgid "_Fulltext Search"
-msgstr ""
+msgstr "全文検索(_F)"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:8
msgid "_Show Advanced Settings"
-msgstr ""
+msgstr "詳細設定(_S)"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:10
msgid "_Update Search Index…"
-msgstr ""
+msgstr "検索インデックスの更新(_U)"
#: ../data/ui/CatfishWindow.ui.h:11
msgid "Catfish"
-msgstr ""
+msgstr "Catfish"
#: ../data/ui/CatfishWindow.ui.h:12
msgid "Select a Directory"
-msgstr ""
+msgstr "フォルダを選択"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
-msgstr ""
+msgstr "語句を入れてEnterを押して下さい"
#: ../data/ui/CatfishWindow.ui.h:14
msgid "Any time"
-msgstr ""
+msgstr "時刻指定なし"
#: ../data/ui/CatfishWindow.ui.h:15
msgid "This week"
-msgstr ""
+msgstr "今週"
#: ../data/ui/CatfishWindow.ui.h:16
msgid "Custom"
-msgstr ""
+msgstr "カスタム"
#: ../data/ui/CatfishWindow.ui.h:17
msgid "Modified"
-msgstr ""
+msgstr "変更日時"
#: ../data/ui/CatfishWindow.ui.h:18
msgid "Documents"
-msgstr ""
+msgstr "文書"
#: ../data/ui/CatfishWindow.ui.h:19
-msgid "Images"
+msgid "Folders"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:20
-msgid "Music"
-msgstr ""
+msgid "Images"
+msgstr "画像"
#: ../data/ui/CatfishWindow.ui.h:21
-msgid "Videos"
-msgstr ""
+msgid "Music"
+msgstr "音楽"
#: ../data/ui/CatfishWindow.ui.h:22
-msgid "Applications"
-msgstr ""
+msgid "Videos"
+msgstr "動画"
#: ../data/ui/CatfishWindow.ui.h:23
+msgid "Applications"
+msgstr "アプリケーション"
+
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "その他"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
-msgstr ""
+msgstr "ファイルタイプ"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
-msgstr ""
+msgstr "期間指定"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
-msgstr ""
+msgstr "今日へ移動"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
-msgstr ""
+msgstr "開始日時"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
-msgstr ""
+msgstr "終了日時"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
-msgstr ""
+msgstr "カスタムファイルタイプ"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
-msgstr ""
+msgstr "既存のMIMEタイプを選択"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
-msgstr ""
+msgstr "拡張子を入力"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
-msgstr ""
+msgstr "ファイルマネージャーで開く(_F)"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
-msgstr ""
+msgstr "位置のコピー(_C)"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
-msgstr ""
+msgstr "検索インデックスの更新"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
-msgstr ""
+msgstr "アンロック"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
-msgstr ""
+msgstr "検索インデックスの更新"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
+"正確な結果を提供するために位置データベースを更新する必要があります。\n"
+"これはsudo(管理者権限)が必要です。"
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
-msgstr ""
+msgstr "データベースを更新しています..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "完了"
#: ../catfish/__init__.py:35
msgid "Show debug messages (-vv debugs catfish_lib also)"
+msgstr "デバッグメッセージを表示(-vv catfish_libもデバッグ)"
+
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "大きいアイコンを使う"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "サムネイルを使う"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "ISO形式で時間を表示する"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "PATH フォルダ内で検索"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "ファイルマネージャーとして FILEMAN を使用"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "ファイルを開くときに WRAPPER を使用"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "完全一致検索"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "隠しファイルを含める"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "全文検索"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "プレビュー"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "ファイル名"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "大きさ"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "位置"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
-msgstr ""
+msgstr "最終更新日時"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "認証に失敗しました。"
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
-msgstr ""
+msgstr "位置データベースの更新が完了しました。"
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
-msgstr ""
+msgstr "位置データベースをアップデート中にエラーが発生しました。"
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
+msgstr "ユーザーが認証を中止しました。"
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
-msgstr ""
+msgstr "検索語句をクリア"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
-msgstr ""
+msgstr "Catfishにはデフォルトのファイルマネージャーが発見できません。"
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
-msgstr ""
+msgstr "Catfishにはデフォルトのオープンラッパーが発見できません。"
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
-msgstr ""
+msgstr "\"%s\" を開けませんでした。"
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
-msgstr ""
+msgstr "\"%s\" は保存されていません。"
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
-msgstr ""
+msgstr "\"%s\" は削除できません。"
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
-msgstr ""
+msgstr "\"%s\" を別名で保存"
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
+"本当に \"%s\"\n"
+" を恒久的に削除しても良いですか?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
+"本当に %i つのファイル\n"
+"を恒久的に削除しても良いですか?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
-msgstr ""
+msgstr "削除されたファイルは二度と復元できません。"
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
-msgstr ""
+msgstr "ファイルが一つも見つかりません。"
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "1つのファイルを発見。"
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
-msgstr ""
+msgstr "%i つのファイルを発見。"
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
-msgstr ""
+msgstr "\"%s\" を検索中"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
-msgstr ""
+msgstr "検索中…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
-msgstr ""
+msgstr "検索を停止"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "\"%s\" の検索結果"
diff -Nru catfish-0.6.3/po/lv.po catfish-0.8.2/po/lv.po
--- catfish-0.6.3/po/lv.po 1970-01-01 00:00:00.000000000 +0000
+++ catfish-0.8.2/po/lv.po 2013-09-21 00:21:01.000000000 +0000
@@ -0,0 +1,361 @@
+# Latvian translation for catfish-search
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the catfish-search package.
+#
+# FIRST AUTHOR , 2013.
+# Rūdolfs Mazurs , 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: catfish-search\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-06-22 10:48+0000\n"
+"Last-Translator: Rūdolfs Mazurs \n"
+"Language-Team: Latvian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+"Language: lv\n"
+
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
+msgid "Catfish File Search"
+msgstr "Catfish datņu meklēšana"
+
+#: ../catfish.desktop.in.h:2
+msgid "Search the file system"
+msgstr "Meklēt datņu sistēmā"
+
+#: ../data/ui/AboutCatfishDialog.ui.h:1
+msgid "Catfish is a versatile file searching tool."
+msgstr "Catfish ir universāls datņu meklēšanas rīks."
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:2
+msgid "_Exact Match"
+msgstr "Atbilst pr_ecīzi"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:4
+msgid "_Hidden Files"
+msgstr "_Slēptās datnes"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:6
+msgid "_Fulltext Search"
+msgstr "_Pilna teksta meklēšana"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:8
+msgid "_Show Advanced Settings"
+msgstr "Rādīt paplašināto_s iestatījumus"
+
+#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
+#: ../data/ui/CatfishWindow.ui.h:10
+msgid "_Update Search Index…"
+msgstr "Atja_unināt meklēšanas indeksu…"
+
+#: ../data/ui/CatfishWindow.ui.h:11
+msgid "Catfish"
+msgstr "Catfish"
+
+#: ../data/ui/CatfishWindow.ui.h:12
+msgid "Select a Directory"
+msgstr "Izvēlieties direktoriju"
+
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
+msgid "Enter search terms and press ENTER"
+msgstr "Ievadiet meklēšanas tekstu un spiediet ENTER"
+
+#: ../data/ui/CatfishWindow.ui.h:14
+msgid "Any time"
+msgstr "Jebkurā laikā"
+
+#: ../data/ui/CatfishWindow.ui.h:15
+msgid "This week"
+msgstr "Šajā nedēļā"
+
+#: ../data/ui/CatfishWindow.ui.h:16
+msgid "Custom"
+msgstr "Pielāgots"
+
+#: ../data/ui/CatfishWindow.ui.h:17
+msgid "Modified"
+msgstr "Mainīts"
+
+#: ../data/ui/CatfishWindow.ui.h:18
+msgid "Documents"
+msgstr "Dokumenti"
+
+#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
+msgid "Images"
+msgstr "Attēli"
+
+#: ../data/ui/CatfishWindow.ui.h:21
+msgid "Music"
+msgstr "Mūzika"
+
+#: ../data/ui/CatfishWindow.ui.h:22
+msgid "Videos"
+msgstr "Video"
+
+#: ../data/ui/CatfishWindow.ui.h:23
+msgid "Applications"
+msgstr "Lietotnes"
+
+#: ../data/ui/CatfishWindow.ui.h:24
+msgid "Other"
+msgstr "Citi"
+
+#: ../data/ui/CatfishWindow.ui.h:25
+msgid "File Type"
+msgstr "Datnes tips"
+
+#: ../data/ui/CatfishWindow.ui.h:26
+msgid "Custom Time Range"
+msgstr "Pielāgots laika intervāls"
+
+#: ../data/ui/CatfishWindow.ui.h:27
+msgid "Go to Today"
+msgstr "Iet uz šodienu"
+
+#: ../data/ui/CatfishWindow.ui.h:28
+msgid "Start Date"
+msgstr "Sākuma datums"
+
+#: ../data/ui/CatfishWindow.ui.h:29
+msgid "End Date"
+msgstr "Beigu datums"
+
+#: ../data/ui/CatfishWindow.ui.h:30
+msgid "Custom File Type"
+msgstr "Pielāgots datņu tips"
+
+#. The "mimetype" is the file type of the file, such as "application/octet-stream"
+#: ../data/ui/CatfishWindow.ui.h:32
+msgid "Select existing mimetype"
+msgstr "Izvēlieties esošu mime tipu"
+
+#. Enter "file extensions" such as .doc, .pdf
+#: ../data/ui/CatfishWindow.ui.h:34
+msgid "Enter file extensions"
+msgstr "Ievadiet datnes paplašinājumu"
+
+#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
+#: ../data/ui/CatfishWindow.ui.h:36
+msgid "Show in _File Manager"
+msgstr "Rādīt _datņu pārvaldniekā"
+
+#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
+#: ../data/ui/CatfishWindow.ui.h:38
+msgid "_Copy Location"
+msgstr "_Kopēt atrašanās vietu"
+
+#: ../data/ui/CatfishWindow.ui.h:39
+msgid "Update Search Index"
+msgstr "Atjaunināt meklēšanas indeksu"
+
+#: ../data/ui/CatfishWindow.ui.h:40
+msgid "Unlock"
+msgstr "Atbloķēt"
+
+#: ../data/ui/CatfishWindow.ui.h:41
+msgid "Update Search Index"
+msgstr "Atjaunināt meklēšanas indeksu"
+
+#. The term "locate" is a commandline application, so it should not be translated.
+#: ../data/ui/CatfishWindow.ui.h:43
+msgid ""
+"To provide accurate results, the locate database needs to be "
+"refreshed.\n"
+"This requires sudo (admin) rights."
+msgstr ""
+"Lai dotu aktuālus rezultātus, ir jāatjaunina locate datubāze.\n"
+"Tam ir vajadzīgas sudo (administratora) tiesības."
+
+#: ../data/ui/CatfishWindow.ui.h:45
+msgid "Updating database…"
+msgstr "Atjaunina datubāzi…"
+
+#: ../data/ui/CatfishWindow.ui.h:46
+msgid "Done."
+msgstr "Pabeigts."
+
+#: ../catfish/__init__.py:35
+msgid "Show debug messages (-vv debugs catfish_lib also)"
+msgstr "Rādīt atkļūdošanas ziņojumus (-vv arī atkļūdo catfish_lib)"
+
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Lietot lielas ikonas"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Lietot sīktēlus"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "Rādīt laiku ISO formātā"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Meklēt mapē PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Izmantot FILEMAN ka datņu pārvaldnieku"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "Izmantot WRAPPER, lai atvērtu datnes"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "Meklēt precīzas sakritības"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Iekļaut slēptās datnes"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "Veikt pilna teksta meklēšanu"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
+msgid "Preview"
+msgstr "Priekšskatīt"
+
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
+msgid "Filename"
+msgstr "Datnes nosaukums"
+
+#: ../catfish/CatfishWindow.py:246
+msgid "Size"
+msgstr "Izmērs"
+
+#: ../catfish/CatfishWindow.py:248
+msgid "Location"
+msgstr "Vieta"
+
+#: ../catfish/CatfishWindow.py:250
+msgid "Last modified"
+msgstr "Pēdējo reizi mainīta"
+
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Autentificēšanās neveiksmīga."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
+msgid "Locate database updated successfully."
+msgstr "Locate datubāze ir veiksmīgi atjaunināta."
+
+#: ../catfish/CatfishWindow.py:322
+msgid "An error occurred while updating locatedb."
+msgstr "Gadījās kļūda, atjaunojot locatedb."
+
+#: ../catfish/CatfishWindow.py:324
+msgid "User aborted authentication."
+msgstr "Lietotājs apturēja autentificēšanos."
+
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
+msgid "Clear search terms"
+msgstr "Attīrīt meklēšanas tekstu"
+
+#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
+#: ../catfish/CatfishWindow.py:693
+msgid "Catfish could not find the default file manager."
+msgstr "Catfish nevarēja atrast noklusējuma datņu pārvaldnieku."
+
+#. Translators: This message will only appear when the default application for opening a file cannot be found.
+#: ../catfish/CatfishWindow.py:699
+msgid "Catfish could not find the default open wrapper."
+msgstr "Catfish nevarēja atrast noklusējuma atvēršanas ietinumu."
+
+#: ../catfish/CatfishWindow.py:713
+#, python-format
+msgid "\"%s\" could not be opened."
+msgstr "Neizdevās atvērt “%s”."
+
+#: ../catfish/CatfishWindow.py:756
+#, python-format
+msgid "\"%s\" could not be saved."
+msgstr "Neizdevās saglabāt “%s”"
+
+#: ../catfish/CatfishWindow.py:781
+#, python-format
+msgid "\"%s\" could not be deleted."
+msgstr "Neizdevās izdzēst “%s”"
+
+#: ../catfish/CatfishWindow.py:793
+#, python-format
+msgid "Save \"%s\" as…"
+msgstr "Saglabāt “%s” kā…"
+
+#: ../catfish/CatfishWindow.py:820
+#, python-format
+msgid ""
+"Are you sure that you want to \n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Vai tiešām vēlaties\n"
+"neatgriezeniski dzēst “%s”?"
+
+#: ../catfish/CatfishWindow.py:824
+#, python-format
+msgid ""
+"Are you sure that you want to \n"
+"permanently delete the %i selected files?"
+msgstr ""
+"Vai tiešām vēlaties neatgriezeniski \n"
+"dzēst %i izvēlētās datnes?"
+
+#: ../catfish/CatfishWindow.py:827
+msgid "If you delete a file, it is permanently lost."
+msgstr "Ja izdzēsīsiet datni, tā tiks neatgriezeniski zaudēta."
+
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
+msgid "No files found."
+msgstr "Nav atrastu datņu."
+
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "Atrasta viena datne."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
+#, python-format
+msgid "%i files found."
+msgstr "Atrastas %i datnes."
+
+#: ../catfish/CatfishWindow.py:1190
+#, python-format
+msgid "Searching for \"%s\""
+msgstr "Meklē “%s”"
+
+#: ../catfish/CatfishWindow.py:1192
+msgid "Searching…"
+msgstr "Meklē…"
+
+#: ../catfish/CatfishWindow.py:1196
+msgid "Stop Search"
+msgstr "Apturēt meklēšanu"
+
+#: ../catfish/CatfishWindow.py:1284
+#, python-format
+msgid "Search results for \"%s\""
+msgstr "“%s” meklēšanas rezultāti"
diff -Nru catfish-0.6.3/po/nl.po catfish-0.8.2/po/nl.po
--- catfish-0.6.3/po/nl.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/nl.po 2013-09-21 00:21:01.000000000 +0000
@@ -1,23 +1,24 @@
# Dutch translation for catfish-search
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the catfish-search package.
-# FIRST AUTHOR , 2013.
+# Pjotr , 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2012-10-15 10:58+0000\n"
-"Last-Translator: Pjotr12345 \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-05-12 18:01+0000\n"
+"Last-Translator: Pjotr \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Catfish bestandenzoeker"
@@ -32,27 +33,27 @@
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:2
msgid "_Exact Match"
-msgstr "Exacte overeenkomst"
+msgstr "_Exacte overeenkomst"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:4
msgid "_Hidden Files"
-msgstr "Verborgen bestanden"
+msgstr "_Verborgen bestanden"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:6
msgid "_Fulltext Search"
-msgstr "Tekst doorzoeken"
+msgstr "_Tekst doorzoeken"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:8
msgid "_Show Advanced Settings"
-msgstr "Toon de geavanceerde instellingen"
+msgstr "Toon de _geavanceerde instellingen"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:10
msgid "_Update Search Index…"
-msgstr "Zoekindex opnieuw samenstellen ..."
+msgstr "Zoekindex _opnieuw samenstellen ..."
#: ../data/ui/CatfishWindow.ui.h:11
msgid "Catfish"
@@ -60,10 +61,10 @@
#: ../data/ui/CatfishWindow.ui.h:12
msgid "Select a Directory"
-msgstr ""
+msgstr "Kies een map"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Voer zoektermen in en druk op ENTER"
@@ -88,97 +89,101 @@
msgstr "Documenten"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Afbeeldingen"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Muziek"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Video's"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Toepassingen"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Anders"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Bestandtype"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Aangepast tijdsbestek"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Ga naar vandaag"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Begindatum"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Einddatum"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr "Aangepast bestandtype"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr "Kies bestaand mimetype"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Voer bestandextensies in"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
-msgstr "Toon in Bestandsbeheer"
+msgstr "Toon in bestandbeheer"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
-msgstr "Pad kopieren"
+msgstr "Locatie kopiëren"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Werk de zoekindex bij"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Ontgrendel"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr "Werk zoekindex bij"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-"Om accurate resultaten te geven, moet de locate gegevensbank worden "
+"Om accurate resultaten te geven, moet de gegevensbank locate worden "
"ververst.\n"
"Dit vereist sudo-rechten (beheerder)."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr "Bezig met bijwerken van gegevensbank..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Gereed."
@@ -187,78 +192,123 @@
msgstr ""
"Toon foutopsporingsmeldingen (-vv spoort ook fouten op in catfish_lib)"
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Voorbeeldweergave"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Bestandnaam"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Grootte"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Locatie"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Laatst bewerkt"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Authenticatie is mislukt."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Gegevensbank op harde schijf met succes bijgewerkt."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Er trad een fout op bij het bijwerken van locatedb."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr "Gebruiker brak authenticatie af."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Authenticatie is mislukt."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Zoektermen wissen"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
-msgstr "Catfish kon de standaard bestandsbeheerder niet vinden"
+msgstr "Catfish kon de standaard-bestandbeheerder niet vinden"
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
"Catfish kon de standaardtoepassing niet vinden om het bestand te openen."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "‘%s’ kon niet geopend worden."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "'%s' kon niet opgeslagen worden."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "'%s' kon niet gewist worden."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr "'%s' opslaan als..."
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -267,7 +317,7 @@
"Weet u zeker dat u '%s' \n"
"blijvend wil verwijderen?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -276,33 +326,37 @@
"Weet u zeker dat u de %i gekozen \n"
"bestanden blijvend wil verwijderen?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Als u een bestand verwijdert, is het voorgoed verloren."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Geen bestanden gevonden."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr "%i bestanden gevonden."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Aan het zoeken naar '%s'"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Aan het zoeken..."
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "Staak zoektocht"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Zoekresultaten voor ‘%s’"
diff -Nru catfish-0.6.3/po/pl.po catfish-0.8.2/po/pl.po
--- catfish-0.6.3/po/pl.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/pl.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search 0.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
"PO-Revision-Date: 2013-03-26 22:38+0000\n"
"Last-Translator: Piotr Strębski \n"
"Language-Team: polski <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Wyszukiwarka plików Catfish"
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr "Wybierz katalog"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Wyszukuje wyrażenie po wciśnięciu klawisza ENTER"
@@ -88,83 +89,87 @@
msgstr "Dokumenty"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Obrazy"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Muzyka"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Wideo"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Programy"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Inny"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Typ pliku"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Własny zakres czasu"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Przejdź do bieżącej daty"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Data początkowa"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Data końcowa"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr "Własny typ pliku"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr "Wybranie istniejącego typu mime"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Wprowadzenie rozszerzenia pliku"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr "Pokaż w _menedżerze plików"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "S_kopiuj położenie"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Uaktualnianie indeksu wyszukiwania"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Odblokuj"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr "Uaktualnianie indeksu wyszukiwania"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
@@ -174,11 +179,11 @@
"bazę danych.\n"
"Do tego celu wymagane są uprawnienia administratora."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr "Uaktualnianie bazy danych…"
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Zakończono."
@@ -188,118 +193,167 @@
"Wypisuje komunikaty diagnozowania błędów (opcje -vv uwzględnia również "
"catfish_lib)"
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Podgląd"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Nazwa pliku"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Rozmiar"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Położenie"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Czas modyfikacji"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Nieudane uwierzytelnianie."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Zaktualizowano bazę nazw plików."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Wystąpił błąd podczas uaktualniania bazy nazw plików."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr "Użytkownik anulował uwierzytelnianie."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Nieudane uwierzytelnianie."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Czyści kryteria wyszukiwania"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr "Catfish nie może odnaleźć domyślnego menedżera plików."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
"Catfish nie może odnaleźć domyślonego otwierającego programu pośredniczącego."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "Nie można otworzyć „%s”."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "Nie można zapisać „%s”."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "Nie można usunąć „%s”."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr "Zapisz „%s” jako…"
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr "Usunąć trwale „%s”?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr "Usunąć trwale %i zaznaczonych plików?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Plik zostanie nieodwracalnie usunięty."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Nie odnaleziono plików."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr "Odnaleziono %i plików."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Wyszukiwanie wyrażenia „%s”"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Wyszukiwanie…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "Zatrzymuje wyszukiwanie"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Wyniki wyszukiwania wyrażenia „%s”"
diff -Nru catfish-0.6.3/po/pt_BR.po catfish-0.8.2/po/pt_BR.po
--- catfish-0.6.3/po/pt_BR.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/pt_BR.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-04-05 12:47+0000\n"
-"Last-Translator: Lucas S. B. Mastella \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-09-04 16:02+0000\n"
+"Last-Translator: Rodrigo Zimmermann \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-09-05 05:10+0000\n"
+"X-Generator: Launchpad (build 16758)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Catfish Pesquisar Arquivo"
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr "Selecione um diretório"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Digite os termos de pesquisa e pressione ENTER"
@@ -88,83 +89,87 @@
msgstr "Documentos"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr "Pastas"
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Imagens"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Música"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Vídeos"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Aplicativos"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Outro"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Tipo de Arquivo"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Intervalo de tempo personalizado"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Ir para Hoje"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Data Inicial"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Data Final"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr "Tipo de Arquivo Personalizado"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr "Selecione mimetype existente"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Digite a extensão do arquivo"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
-msgstr ""
+msgstr "Mostrar no Gerenciador de Arquivos"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "_Copiar Localização"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Atualizar Índice de Pesquisa"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Desbloquear"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr "Atualizar Indice de Pesquisa"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
@@ -174,11 +179,11 @@
"ser atualizada.\n"
"Isso requer privilégios de sudo (admin)."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr "Atualizando base de dados..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Concluído."
@@ -186,77 +191,122 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr "Mostrar mensagens de debug (-vv debugs catfish_lib também)"
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Usar icones grandes"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Usar miniaturas"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Procurar na pasta PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Usar FILEMAN como gerenciador de arquivos"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Incluir arquivos ocultos"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Visualização"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Nome do arquivo"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Tamanho"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Localização"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Última modificação"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Falha na autenticação."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Banco de dados de localização atualizado com sucesso."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Ocorreu um erro durante a atualização do locatedb."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr "Autenticação de usuário abortada."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Falha na autenticação."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Limpar os termos de pesquisa"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr "Catfish não encontrou o gerenciador de arquivos padrão."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
-msgstr ""
+msgstr "Catfish não encontrou aplicativo compatível com este arquivo."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "\"%s\" não pôde ser aberto."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "\"%s\" não pôde ser salvo."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "\"%s\" não pôde ser deletado."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr "Salvar \"%s\" como..."
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -265,7 +315,7 @@
"Tem certeza que deseja \n"
"deletar permanentemente \"%s\"?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -274,33 +324,37 @@
"Tem certeza que deseja \n"
"deletar permanentemente os %i arquivos selecionados?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Se você remover um arquivo, ele será perdido permanentemente."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Nenhum arquivo encontrado."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "1 arquivo encontrado."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr "%i arquivos encontrados."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Procurando por \"%s\""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Pesquisando…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "Parar Busca"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Resultados da pesquisa para \"%s\""
diff -Nru catfish-0.6.3/po/ru.po catfish-0.8.2/po/ru.po
--- catfish-0.6.3/po/ru.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/ru.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,63 +7,64 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-02-24 00:59+0000\n"
-"Last-Translator: Sean Davis \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-07-24 19:18+0000\n"
+"Last-Translator: Sergey Shlyapugin \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
-msgstr ""
+msgstr "Поиск файлов Catfish"
#: ../catfish.desktop.in.h:2
msgid "Search the file system"
-msgstr ""
+msgstr "Поиск по файловой системе"
#: ../data/ui/AboutCatfishDialog.ui.h:1
msgid "Catfish is a versatile file searching tool."
-msgstr ""
+msgstr "Catfish — универсальный инструмент для поиска файлов."
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:2
msgid "_Exact Match"
-msgstr ""
+msgstr "_Точное совпадение"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:4
msgid "_Hidden Files"
-msgstr ""
+msgstr "_Скрытые файлы"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:6
msgid "_Fulltext Search"
-msgstr ""
+msgstr "_Полнотекстовый поиск"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:8
msgid "_Show Advanced Settings"
-msgstr ""
+msgstr "Показать _расширенные настройки"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:10
msgid "_Update Search Index…"
-msgstr ""
+msgstr "Обновить поисковый _индекс…"
#: ../data/ui/CatfishWindow.ui.h:11
msgid "Catfish"
-msgstr ""
+msgstr "Catfish"
#: ../data/ui/CatfishWindow.ui.h:12
msgid "Select a Directory"
-msgstr ""
+msgstr "Выберите каталог"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Введите поисковый запрос и нажмите ENTER"
@@ -73,227 +74,287 @@
#: ../data/ui/CatfishWindow.ui.h:15
msgid "This week"
-msgstr ""
+msgstr "Эта неделя"
#: ../data/ui/CatfishWindow.ui.h:16
msgid "Custom"
-msgstr ""
+msgstr "Указать период"
#: ../data/ui/CatfishWindow.ui.h:17
msgid "Modified"
-msgstr ""
+msgstr "Изменён"
#: ../data/ui/CatfishWindow.ui.h:18
msgid "Documents"
msgstr "Документы"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr "Папки"
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Изображения"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Музыка"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Видео"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Приложения"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Другое"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
-msgstr ""
+msgstr "Тип файла"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Выберите период времени"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
-msgstr ""
+msgstr "Сегодня"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
-msgstr ""
+msgstr "Начальная дата"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
-msgstr ""
+msgstr "Конечная дата"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
-msgstr ""
+msgstr "Выберите тип файла"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
-msgstr ""
+msgstr "Выберите существующий MIME-тип"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
-msgstr ""
+msgstr "Введите расширение файла"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
-msgstr ""
+msgstr "Показать в _файловом менеджере"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
-msgstr ""
+msgstr "_Копировать адрес"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Обновить поисковый индекс"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
-msgstr ""
+msgstr "Разблокировать"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
-msgstr ""
+msgstr "Обновлениe поискового индекса"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
+"База данных locate нуждается в обновлении, чтобы обеспечить точные "
+"результаты.\n"
+"Необходимы права администратора (sudo)."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
-msgstr ""
+msgstr "Обновление базы данных…"
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Готово."
#: ../catfish/__init__.py:35
msgid "Show debug messages (-vv debugs catfish_lib also)"
+msgstr "Показывать сообщения отладки (-vv также отлаживает catfish_lib)"
+
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Использовать большие значки"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Использовать эскизы"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "Отображать время в формате ISO"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Искать в папке PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Использовать FILEMAN как файловый менеджер"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "Использовать WRAPPER для открытия файлов"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "Точное совпадение"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Искать в скрытых файлах"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "Выполнять полнотекстовый поиск"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Предпросмотр"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Имя файла"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Размер"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Местонахождение"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Последнее изменение"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Ошибка авторизации."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "База данных locate успешно обновлена."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Возникла ошибка при обновлении locatedb."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
-msgstr ""
+msgstr "Пользователь прервал авторизацию."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Очистить поисковый запрос"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
-msgstr ""
+msgstr "Catfish не нашёл файловый менеджер по умолчанию."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
-msgstr ""
+msgstr "Catfish не нашёл приложение, открывающее файл по умолчанию."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
-msgstr ""
+msgstr "\"%s\" невозможно открыть."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
-msgstr ""
+msgstr "«%s» не может быть сохранён."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
-msgstr ""
+msgstr "«%s» не может быть удалён."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
-msgstr ""
+msgstr "Сохранить «%s» как…"
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
+"Вы уверены, что хотите \n"
+"безвозвратно удалить «%s»?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
+"Вы уверены, что хотите \n"
+"безвозвратно удалить %i выделенных файла (-ов)?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
-msgstr ""
+msgstr "Если вы удалите файл, он будет безвозвратно утерян."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Файлы не найдены."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "Найден 1 файл."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
-msgstr ""
+msgstr "Найдено файлов: %i."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Поиск «%s»"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
-msgstr ""
+msgstr "Поиск…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
-msgstr ""
+msgstr "Остановить Поиск"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Результаты поиска «%s»"
diff -Nru catfish-0.6.3/po/sk.po catfish-0.8.2/po/sk.po
--- catfish-0.6.3/po/sk.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/sk.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-03-18 12:17+0000\n"
-"Last-Translator: DAG Software \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-05-03 10:15+0000\n"
+"Last-Translator: Juraj Salus \n"
"Language-Team: Slovak \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Vyhľadávač súborov Catfish"
@@ -27,7 +28,7 @@
#: ../data/ui/AboutCatfishDialog.ui.h:1
msgid "Catfish is a versatile file searching tool."
-msgstr ""
+msgstr "Catfish je všestranný nájstroj na vyhľadávanie súborov."
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:2
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr "Vybrať priečinok"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Zadajte hľadané výrazy a stlačte ENTER"
@@ -88,212 +89,272 @@
msgstr "Dokumenty"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Obrázky"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Hudba"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Videá"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Programy"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Iné"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Typ súboru"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Vlastný časový rozsah"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Prejsť na dnešok"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Dátum od"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Dátum do"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr "Vlastný typ súboru"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr "Vybrať existujúci mime typ"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Zadajte prípony súborov"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr "Zobraziť v _Správcovi súborov"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "_Kopírovať umiestnenie"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Aktualizovať index vyhľadávania"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Odomknúť"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr "Aktualizovať index vyhľadávania"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
+"Pre dosiahnutie najlepších výsledkov, locate databázy musia byť "
+"aktualizované.\n"
+"To si vyžaduje sudo (admin) práva."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr "Aktualizuje sa databáza"
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Hotovo."
#: ../catfish/__init__.py:35
msgid "Show debug messages (-vv debugs catfish_lib also)"
+msgstr "Zobraziť správy Debug (-vv debugs catfish_lib also)"
+
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Náhľad"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Názov súboru"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Veľkosť"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Umiestnenie"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Naposledy zmenené"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Overenie zlyhalo."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Lokačná databázá úspešne aktualizovaná."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Počas aktualizácie lokačnej databázy sa vyskytla chyba."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr "Používateľ zrušil overovanie"
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Overenie zlyhalo."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Vyčistiť vyhľadávané výrazy"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
-msgstr ""
+msgstr "Catfish nenašiel prednastaveného správcu súborov."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
-msgstr ""
+msgstr "Catfish nenašiel prednastavenú aplikáciu."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "\"%s\" sa nepodarilo otvoriť."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "\"%s\" sa nepodarilo uložiť."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "\"%s\" sa nepodarilo vymazať."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr "Uložiť \"%s\" ako…"
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
+"Ste si istý, že chcete natrvalo zmazať \n"
+"\"%s\"?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
+"Ste si istý, že chcete natrvalo zmazať \n"
+"%i vybraných súborov?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Ak súbor vymažete, bude nenávratne stratený."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Žiadny súbor sa nenašiel."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr "%i súborov nájdených."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Hľadá sa \"%s\""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Hľadá sa…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "Zastaviť vyhľadávanie"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Výsledky vyhľadávania \"%s\""
diff -Nru catfish-0.6.3/po/sr.po catfish-0.8.2/po/sr.po
--- catfish-0.6.3/po/sr.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/sr.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-04-02 22:25+0000\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-09-01 05:18+0000\n"
"Last-Translator: Саша Петровић \n"
"Language-Team: Serbian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-03 05:39+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-09-02 05:24+0000\n"
+"X-Generator: Launchpad (build 16750)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr "Сом (Catfish) претрага датотека"
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr "Изаберите фасциклу"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Унесите услове претраге и притисните ВРАТИ"
@@ -88,83 +89,87 @@
msgstr "Документи"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr "Фасцикле"
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Слике"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Музика"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Видео"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Програми"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Друго"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "Врста датотеке"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Прилагођен временски опсег"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "Иди на данашњи дан"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "Почетни датум"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "Завршни датум"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr "Прилагођена врста датотека"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr "Означите постојећу МИМЕ врсту"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr "Унесите наставак датотеке"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr "Прикажи у _управнику датотека"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr "_Умножи путању"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Освежи садржај претраге"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "Откључај"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr "Освежи списак датотека претраге"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
@@ -174,11 +179,11 @@
"освежена.\n"
"То захтева судо (административна) овлашћења."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr "Освежавам оставу података..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Урађено."
@@ -186,78 +191,123 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr "Приказуј поруке праћења грешака (такође и -vv debugs catfish_lib)"
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Користи велике иконице"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Користи умањене сличице"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "Приказуј време у ИСО облику"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Тражи у путањи фасцикле"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Користи FILEMAN као управника датотека"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "Користи WRAPPER за отварање датотека"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "Изведи потпуно слагање"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Укључи скривене датотеке"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "Изведи потпуну претрагу текста"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr "%s (неисправно шифровање знакова)"
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Преглед"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Назив датотеке"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Величина"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Место"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Последња измена"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Потврђивање идентитета није успело."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Остава наредбе locate је успешно освежена."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Десила се грешка приликом освежавања locatedb."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr "Потврда идентитета је напуштена од стране корисника."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "Потврђивање идентитета није успело."
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Очисти услове претраге"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr "Сом није успео да пронађе подразумеваног управника датотека."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
"Сом није успео да пронађе подразумеваног отвореног омотача (open wrapper)"
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "Нисам успео да отворим „%s“."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "Нисам успео да сачувам „%s“."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "Нисам успео да избришем „%s“."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr "Сачувај „%s“ као..."
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -266,7 +316,7 @@
"Да ли сте сигурни да желите да \n"
"трајно избришете „%s“?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
@@ -275,33 +325,37 @@
"Да ли сте сигурни да желите да \n"
"трајно избришете %i означених датотека?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr "Ако избришете датотеку, биће трајно изгубљена."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Нисам пронашао ни једну датотеку."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "1 датотека је пронађена."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr "Нашао сам %i датотека."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Тражим „%s“"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "Тражим…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "Заустави претрагу"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Излаз претраге за „%s“"
diff -Nru catfish-0.6.3/po/tr.po catfish-0.8.2/po/tr.po
--- catfish-0.6.3/po/tr.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/tr.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,63 +7,64 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2012-11-03 11:34+0000\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-08-05 19:41+0000\n"
"Last-Translator: Utku BERBEROĞLU \n"
"Language-Team: Turkish
\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
-msgstr ""
+msgstr "Catfish Dosya Arama"
#: ../catfish.desktop.in.h:2
msgid "Search the file system"
-msgstr ""
+msgstr "Dosya sistemini ara"
#: ../data/ui/AboutCatfishDialog.ui.h:1
msgid "Catfish is a versatile file searching tool."
-msgstr ""
+msgstr "Catfish çok yönlü bir dosya arama aracıdır."
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:2
msgid "_Exact Match"
-msgstr ""
+msgstr "_Tam Eşleşme"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:4
msgid "_Hidden Files"
-msgstr ""
+msgstr "_Gizli Dosyalar"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:6
msgid "_Fulltext Search"
-msgstr ""
+msgstr "_Tam Metin Arama"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:8
msgid "_Show Advanced Settings"
-msgstr ""
+msgstr "Ge_lişmiş Ayarları Göster"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:10
msgid "_Update Search Index…"
-msgstr ""
+msgstr "_Arama İndeksini Güncelle"
#: ../data/ui/CatfishWindow.ui.h:11
msgid "Catfish"
-msgstr ""
+msgstr "Kedibalığı"
#: ../data/ui/CatfishWindow.ui.h:12
msgid "Select a Directory"
-msgstr ""
+msgstr "Bir Dizin Seçin"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr "Arama terimlerini girin ve ENTER'e basın."
@@ -73,7 +74,7 @@
#: ../data/ui/CatfishWindow.ui.h:15
msgid "This week"
-msgstr ""
+msgstr "Bu hafta"
#: ../data/ui/CatfishWindow.ui.h:16
msgid "Custom"
@@ -81,219 +82,278 @@
#: ../data/ui/CatfishWindow.ui.h:17
msgid "Modified"
-msgstr ""
+msgstr "Değiştirilmiş"
#: ../data/ui/CatfishWindow.ui.h:18
msgid "Documents"
msgstr "Belgeler"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr "Dizinler"
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Görseller"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Müzik"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Videolar"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Uygulamalar"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Diğer"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
-msgstr ""
+msgstr "Dosya Türü"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Özel Zaman Aralığı"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
-msgstr ""
+msgstr "Bugüne Git"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
-msgstr ""
+msgstr "Bitiş Tarihi"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
-msgstr ""
+msgstr "Özel Dosya Tipi"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
-msgstr ""
+msgstr "Var olan mime türünü seçiniz"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
-msgstr ""
+msgstr "Dosya uzantılarını giriniz"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
-msgstr ""
+msgstr "_Dosya Yöneticisinde Göster"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
-msgstr ""
+msgstr "Konumu _Kopyala"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Arama indeksine güncelleyin"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
-msgstr ""
+msgstr "Kilidi Aç"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
-msgstr ""
+msgstr "Arama İndeksini Güncelle"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
+"Doğru arama sonuçları sağlamak için, konum veritabanı tazelenmeli.\n"
+"Bu sudo (yönetici) yetkisi gerektirir."
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
-msgstr ""
+msgstr "Veritabanı güncelleniyor..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Bitti."
#: ../catfish/__init__.py:35
msgid "Show debug messages (-vv debugs catfish_lib also)"
+msgstr "Hata ayıklama iletilerini göster (-vv debugs catfish_lib also)"
+
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "Büyük simgeler kullan"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "Küçük resimler kullan"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "Zamanı ISO biçiminde göster"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "Dizinde Ara PATH"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "Dosya yöneticisi olarak FILEMAN kullan"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "Dosyaları açmak için WRAPPER kullan"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "Tam eşleşme uygula"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "Gizli dosyaları içer"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "Tam metin aramasını içer"
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Önizleme"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Dosya Adı"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Boyut"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Konum"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Son değiştirilme"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "Doğrulamala başarısız oldu."
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Bulunan veritabanı başarıyla güncellendi."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Bulunan veritabanı güncellenirken bir hata oluştu."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
-msgstr ""
+msgstr "Kullanıcı kimlik doğrulamayı iptal etti."
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr "Arama terimlerini temizle"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
-msgstr ""
+msgstr "Catfish varsayılan dosya yöneticisini bulamadı."
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
-msgstr ""
+msgstr "Catfish dosyayı açacak varsayılan uygulamayı bulamıyor."
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
-msgstr ""
+msgstr "\"%s\" açılamadı."
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
-msgstr ""
+msgstr "\"%s\" kaydedilemedi."
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
-msgstr ""
+msgstr "\"%s\" silinemedi."
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
-msgstr ""
+msgstr "%s 'i Farklı Kaydet"
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
+"%s dosyasını kalıcı olarak silmek \n"
+"istediğinizden emin misiniz?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
+"%i seçili dosyayı kalıcı olarak silmek \n"
+"istediğinizden emin misiniz?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
-msgstr ""
+msgstr "Bir dosya silerseniz, kalıcı olarak kaybedilir."
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Hiç dosya bulunamadı."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "1 dosya bulundu."
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
-msgstr ""
+msgstr "%i dosya bulundu."
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "\"%s\" aranıyor"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
-msgstr ""
+msgstr "Aranıyor..."
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
-msgstr ""
+msgstr "Aramayı Durdur"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "\"%s\" için arama sonuçları"
diff -Nru catfish-0.6.3/po/uk.po catfish-0.8.2/po/uk.po
--- catfish-0.6.3/po/uk.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/uk.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,17 +7,18 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
"PO-Revision-Date: 2012-08-28 20:32+0000\n"
"Last-Translator: Олександр \n"
"Language-Team: Ukrainian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-08-27 04:57+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
msgstr ""
@@ -62,8 +63,8 @@
msgid "Select a Directory"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
msgstr ""
@@ -88,94 +89,98 @@
msgstr "Документи"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr ""
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "Зображення"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "Музика"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "Відео"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "Додатки"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "Інше"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
msgstr "Інший часовий проміжок"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
msgstr ""
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
msgstr ""
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
msgstr ""
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "Поновити пошуковий індекс"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
msgstr ""
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "Завершено."
@@ -183,117 +188,166 @@
msgid "Show debug messages (-vv debugs catfish_lib also)"
msgstr ""
-#: ../catfish/CatfishWindow.py:219
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr ""
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr ""
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr ""
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr ""
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr ""
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr ""
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr ""
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr ""
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr ""
+
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "Попередній перегляд"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "Ім'я файлу"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "Розмір"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "Розташування"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
msgstr "Дата зміни"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "Базу даних locate оновлено успішно."
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "Сталася помилка при оновленні locatedb."
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
msgstr ""
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
msgstr ""
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
msgstr ""
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
msgstr ""
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr ""
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr ""
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr ""
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
msgstr ""
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
msgstr ""
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "Файли не знайдені."
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr ""
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "Пошук «%s»"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr ""
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "Результат пошуку для «%s»"
diff -Nru catfish-0.6.3/po/zh_TW.po catfish-0.8.2/po/zh_TW.po
--- catfish-0.6.3/po/zh_TW.po 2013-04-09 00:02:53.000000000 +0000
+++ catfish-0.8.2/po/zh_TW.po 2013-09-21 00:21:01.000000000 +0000
@@ -7,52 +7,53 @@
msgstr ""
"Project-Id-Version: catfish-search\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-03-01 22:05-0500\n"
-"PO-Revision-Date: 2013-02-24 00:59+0000\n"
-"Last-Translator: Howard Chan \n"
+"POT-Creation-Date: 2013-08-25 21:18-0400\n"
+"PO-Revision-Date: 2013-09-06 02:00+0000\n"
+"Last-Translator: Walter Cheuk \n"
"Language-Team: Chinese (Traditional) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-31 05:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-09-07 05:33+0000\n"
+"X-Generator: Launchpad (build 16760)\n"
-#: ../catfish.desktop.in.h:1
+#. Get the password for sudo
+#: ../catfish.desktop.in.h:1 ../catfish/CatfishWindow.py:290
msgid "Catfish File Search"
-msgstr "Catfish檔案搜尋軟體"
+msgstr "Catfish 檔案搜尋"
#: ../catfish.desktop.in.h:2
msgid "Search the file system"
-msgstr "尋找檔案系統"
+msgstr "搜尋檔案系統"
#: ../data/ui/AboutCatfishDialog.ui.h:1
msgid "Catfish is a versatile file searching tool."
-msgstr "Catfish 是一個多功能檔案尋找工具。"
+msgstr "Catfish 是多功能的檔案搜尋工具。"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:2
msgid "_Exact Match"
-msgstr ""
+msgstr "完全符合(_E)"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:4
msgid "_Hidden Files"
-msgstr ""
+msgstr "隱藏檔案(_H)"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:6
msgid "_Fulltext Search"
-msgstr ""
+msgstr "全文搜尋(_F)"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:8
msgid "_Show Advanced Settings"
-msgstr ""
+msgstr "顯示進階設定(_S)"
#. This menu contains the menu items: _Exact Match, _Hidden Files, _Fulltext Search, _Show Advanced Settings, _Update Search Index, _About
#: ../data/ui/CatfishWindow.ui.h:10
msgid "_Update Search Index…"
-msgstr ""
+msgstr "更新搜尋索引(_U)…"
#: ../data/ui/CatfishWindow.ui.h:11
msgid "Catfish"
@@ -60,12 +61,12 @@
#: ../data/ui/CatfishWindow.ui.h:12
msgid "Select a Directory"
-msgstr ""
+msgstr "選取目錄"
-#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:346
-#: ../catfish/CatfishWindow.py:1229
+#: ../data/ui/CatfishWindow.ui.h:13 ../catfish/CatfishWindow.py:377
+#: ../catfish/CatfishWindow.py:1302
msgid "Enter search terms and press ENTER"
-msgstr "輸入搜尋項目並按「Enter」"
+msgstr "輸入要搜尋的東西並按「Enter」"
#: ../data/ui/CatfishWindow.ui.h:14
msgid "Any time"
@@ -81,225 +82,278 @@
#: ../data/ui/CatfishWindow.ui.h:17
msgid "Modified"
-msgstr "已更改"
+msgstr "最後修改時間"
#: ../data/ui/CatfishWindow.ui.h:18
msgid "Documents"
msgstr "文件"
#: ../data/ui/CatfishWindow.ui.h:19
+msgid "Folders"
+msgstr "資料夾"
+
+#: ../data/ui/CatfishWindow.ui.h:20
msgid "Images"
msgstr "圖片"
-#: ../data/ui/CatfishWindow.ui.h:20
+#: ../data/ui/CatfishWindow.ui.h:21
msgid "Music"
msgstr "音樂"
-#: ../data/ui/CatfishWindow.ui.h:21
+#: ../data/ui/CatfishWindow.ui.h:22
msgid "Videos"
msgstr "影片"
-#: ../data/ui/CatfishWindow.ui.h:22
+#: ../data/ui/CatfishWindow.ui.h:23
msgid "Applications"
msgstr "應用程式"
-#: ../data/ui/CatfishWindow.ui.h:23
+#: ../data/ui/CatfishWindow.ui.h:24
msgid "Other"
msgstr "其他"
-#: ../data/ui/CatfishWindow.ui.h:24
+#: ../data/ui/CatfishWindow.ui.h:25
msgid "File Type"
msgstr "檔案類型"
-#: ../data/ui/CatfishWindow.ui.h:25
+#: ../data/ui/CatfishWindow.ui.h:26
msgid "Custom Time Range"
-msgstr "自動時間範圍"
+msgstr "自訂時間範圍"
-#: ../data/ui/CatfishWindow.ui.h:26
+#: ../data/ui/CatfishWindow.ui.h:27
msgid "Go to Today"
msgstr "移至今天"
-#: ../data/ui/CatfishWindow.ui.h:27
+#: ../data/ui/CatfishWindow.ui.h:28
msgid "Start Date"
msgstr "開始日期"
-#: ../data/ui/CatfishWindow.ui.h:28
+#: ../data/ui/CatfishWindow.ui.h:29
msgid "End Date"
msgstr "結束日期"
-#: ../data/ui/CatfishWindow.ui.h:29
+#: ../data/ui/CatfishWindow.ui.h:30
msgid "Custom File Type"
-msgstr "自定檔案類别"
+msgstr "自訂檔案類别"
#. The "mimetype" is the file type of the file, such as "application/octet-stream"
-#: ../data/ui/CatfishWindow.ui.h:31
+#: ../data/ui/CatfishWindow.ui.h:32
msgid "Select existing mimetype"
-msgstr "選擇現有mime類型"
+msgstr "選取現有MIME類型"
#. Enter "file extensions" such as .doc, .pdf
-#: ../data/ui/CatfishWindow.ui.h:33
+#: ../data/ui/CatfishWindow.ui.h:34
msgid "Enter file extensions"
-msgstr "輸入檔案延伸"
+msgstr "輸入檔案延伸檔名"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:35
+#: ../data/ui/CatfishWindow.ui.h:36
msgid "Show in _File Manager"
-msgstr ""
+msgstr "在檔案管理員顯示(_F)"
#. This menu contains the menu items: _Open, Show in _File Manager, _Copy Location, Save _As, _Delete
-#: ../data/ui/CatfishWindow.ui.h:37
+#: ../data/ui/CatfishWindow.ui.h:38
msgid "_Copy Location"
-msgstr ""
+msgstr "複製位置(_C)"
-#: ../data/ui/CatfishWindow.ui.h:38
+#: ../data/ui/CatfishWindow.ui.h:39
msgid "Update Search Index"
msgstr "更新搜尋索引"
-#: ../data/ui/CatfishWindow.ui.h:39
+#: ../data/ui/CatfishWindow.ui.h:40
msgid "Unlock"
msgstr "解除鎖定"
-#: ../data/ui/CatfishWindow.ui.h:40
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Index"
-msgstr "更新尋找索引"
+msgstr "更新搜尋索引"
#. The term "locate" is a commandline application, so it should not be translated.
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:43
msgid ""
"To provide accurate results, the locate database needs to be "
"refreshed.\n"
"This requires sudo (admin) rights."
msgstr ""
-"為了提供準確结果,位置資料庫需要重新整理。\n"
-"這需要sudo(系统管理員)許可。"
+"要重新整理搜尋程式 locate 的資料庫才能提供準確结果。\n"
+"這需要 sudo (系统管理員) 權限。"
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "Updating database…"
-msgstr "更新資料庫中。。。"
+msgstr "正在更新資料庫..."
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:46
msgid "Done."
msgstr "完成。"
#: ../catfish/__init__.py:35
msgid "Show debug messages (-vv debugs catfish_lib also)"
-msgstr "顯示解臭蟲信息(-vv也會解臭蟲catfish_lib)"
+msgstr "顯示除錯訊息(使用 -vv 同時為 catfish_lib 除錯)"
+
+#: ../catfish/__init__.py:38
+msgid "Use large icons"
+msgstr "使用大圖示"
+
+#: ../catfish/__init__.py:40
+msgid "Use thumbnails"
+msgstr "使用縮圖"
+
+#: ../catfish/__init__.py:42
+msgid "Display time in ISO format"
+msgstr "以 ISO 格式顯示時間"
+
+#. Translators: Do not translate PATH, it is a variable.
+#: ../catfish/__init__.py:44
+msgid "Search in folder PATH"
+msgstr "搜尋 PATH 資料夾"
+
+#. Translators: Do not translate FILEMAN, it is a variable.
+#: ../catfish/__init__.py:46
+msgid "Use FILEMAN as filemanager"
+msgstr "以 FILEMAN 作為檔案管理員"
+
+#. Translators: Do not translate WRAPPER, it is a variable.
+#: ../catfish/__init__.py:49
+msgid "Use WRAPPER to open files"
+msgstr "以 WRAPPER 開啟檔案"
+
+#: ../catfish/__init__.py:51
+msgid "Perform exact match"
+msgstr "需要完全符合"
+
+#: ../catfish/__init__.py:53
+msgid "Include hidden files"
+msgstr "包含隱藏檔案"
+
+#: ../catfish/__init__.py:55
+msgid "Perform fulltext search"
+msgstr "進行全文搜尋"
-#: ../catfish/CatfishWindow.py:219
+#. Translators: this text is displayed next to a filename that is not utf-8 encoded.
+#: ../catfish/CatfishWindow.py:75
+#, python-format
+msgid "%s (invalid encoding)"
+msgstr "%s (編碼無效)"
+
+#: ../catfish/CatfishWindow.py:237
msgid "Preview"
msgstr "預覽"
-#: ../catfish/CatfishWindow.py:222 ../catfish/CatfishWindow.py:226
+#: ../catfish/CatfishWindow.py:240 ../catfish/CatfishWindow.py:244
msgid "Filename"
msgstr "檔案名稱"
-#: ../catfish/CatfishWindow.py:228
+#: ../catfish/CatfishWindow.py:246
msgid "Size"
msgstr "大小"
-#: ../catfish/CatfishWindow.py:230
+#: ../catfish/CatfishWindow.py:248
msgid "Location"
msgstr "位置"
-#: ../catfish/CatfishWindow.py:232
+#: ../catfish/CatfishWindow.py:250
msgid "Last modified"
-msgstr "最後修改"
+msgstr "最後修改時間"
+
+#: ../catfish/CatfishWindow.py:297 ../catfish/CatfishWindow.py:326
+msgid "Authentication failed."
+msgstr "未能核對身分。"
-#: ../catfish/CatfishWindow.py:284
+#: ../catfish/CatfishWindow.py:320 ../catfish/CatfishWindow.py:328
msgid "Locate database updated successfully."
msgstr "成功更新 locate 資料庫。"
-#: ../catfish/CatfishWindow.py:286
+#: ../catfish/CatfishWindow.py:322
msgid "An error occurred while updating locatedb."
msgstr "更新 locatedb 時發生錯誤。"
-#: ../catfish/CatfishWindow.py:288 ../catfish/CatfishWindow.py:292
+#: ../catfish/CatfishWindow.py:324
msgid "User aborted authentication."
-msgstr "使用者放棄認證。"
+msgstr "使用者放棄核對身分。"
-#: ../catfish/CatfishWindow.py:290
-msgid "Authentication failed."
-msgstr "認證失敗。"
-
-#: ../catfish/CatfishWindow.py:349 ../catfish/CatfishWindow.py:1236
+#: ../catfish/CatfishWindow.py:380 ../catfish/CatfishWindow.py:1309
msgid "Clear search terms"
-msgstr "清除搜尋項目"
+msgstr "清除要搜尋的東西"
#. Translators: This message will only appear when trying to open the default file manager but it cannot be found.
-#: ../catfish/CatfishWindow.py:655
+#: ../catfish/CatfishWindow.py:693
msgid "Catfish could not find the default file manager."
-msgstr ""
+msgstr "Catfish 找不到預設的檔案管理員。"
#. Translators: This message will only appear when the default application for opening a file cannot be found.
-#: ../catfish/CatfishWindow.py:661
+#: ../catfish/CatfishWindow.py:699
msgid "Catfish could not find the default open wrapper."
-msgstr ""
+msgstr "Catfish 找不到檔案預設的處理程式。"
-#: ../catfish/CatfishWindow.py:675
+#: ../catfish/CatfishWindow.py:713
#, python-format
msgid "\"%s\" could not be opened."
msgstr "無法開啟「%s」。"
-#: ../catfish/CatfishWindow.py:713
+#: ../catfish/CatfishWindow.py:756
#, python-format
msgid "\"%s\" could not be saved."
msgstr "無法儲存「%s」。"
-#: ../catfish/CatfishWindow.py:738
+#: ../catfish/CatfishWindow.py:781
#, python-format
msgid "\"%s\" could not be deleted."
msgstr "無法删除「%s」。"
-#: ../catfish/CatfishWindow.py:750
+#: ../catfish/CatfishWindow.py:793
#, python-format
msgid "Save \"%s\" as…"
-msgstr "儲存「%s」為。。。"
+msgstr "將「%s」另存為..."
-#: ../catfish/CatfishWindow.py:777
+#: ../catfish/CatfishWindow.py:820
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-"你真的要\n"
-"永遠删除「%s」嗎?"
+"真的要\n"
+"永久删除「%s」嗎?"
-#: ../catfish/CatfishWindow.py:781
+#: ../catfish/CatfishWindow.py:824
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-"你真的要\n"
-"永遠删除%i選擇了的檔案嗎?"
+"真的要\n"
+"永久删除所選取的 %i 個檔案嗎?"
-#: ../catfish/CatfishWindow.py:784
+#: ../catfish/CatfishWindow.py:827
msgid "If you delete a file, it is permanently lost."
-msgstr "如果您將一個檔案刪除,它就永遠被丟失。"
+msgstr "如果將檔案刪除,其會永遠消失。"
-#: ../catfish/CatfishWindow.py:1006 ../catfish/CatfishWindow.py:1218
+#: ../catfish/CatfishWindow.py:1046 ../catfish/CatfishWindow.py:1289
msgid "No files found."
msgstr "找不到檔案。"
-#: ../catfish/CatfishWindow.py:1008 ../catfish/CatfishWindow.py:1220
+#: ../catfish/CatfishWindow.py:1048 ../catfish/CatfishWindow.py:1291
+msgid "1 file found."
+msgstr "找到 1 個檔案。"
+
+#: ../catfish/CatfishWindow.py:1050 ../catfish/CatfishWindow.py:1293
#, python-format
msgid "%i files found."
-msgstr "找到%i檔案。"
+msgstr "找到 %i 個檔案。"
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1190
#, python-format
msgid "Searching for \"%s\""
msgstr "正在搜尋「%s」"
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1192
msgid "Searching…"
msgstr "搜尋中…"
-#: ../catfish/CatfishWindow.py:1131
+#: ../catfish/CatfishWindow.py:1196
msgid "Stop Search"
msgstr "停止尋找。"
-#: ../catfish/CatfishWindow.py:1213
+#: ../catfish/CatfishWindow.py:1284
#, python-format
msgid "Search results for \"%s\""
msgstr "搜尋「%s」的結果"