diff -Nru qbzr-0.22.1/debian/changelog qbzr-0.22.2/debian/changelog --- qbzr-0.22.1/debian/changelog 2012-03-11 08:39:14.000000000 +0000 +++ qbzr-0.22.2/debian/changelog 2012-07-20 21:04:47.000000000 +0000 @@ -1,8 +1,21 @@ -qbzr (0.22.1-1~bazaar1~lucid1) lucid; urgency=low +qbzr (0.22.2-1~bazaar1~lucid1) lucid; urgency=low * Rebuild in PPA. - -- Max Bowsher <_@maxb.eu> Sun, 11 Mar 2012 08:39:14 +0000 + -- Max Bowsher <_@maxb.eu> Fri, 20 Jul 2012 22:04:47 +0100 + +qbzr (0.22.2-1) unstable; urgency=low + + [ Andrew Starr-Bochicchio ] + * New upstream release. + * debian/copyright: Use machine-readable format. + * debian/control: Bump Standards-Version to 3.9.3, + no changes needed. + + [ Jelmer Vernooij ] + * Remove myself from uploaders. + + -- Andrew Starr-Bochicchio Fri, 06 Apr 2012 19:48:11 -0400 qbzr (0.22.1-1) unstable; urgency=low diff -Nru qbzr-0.22.1/debian/control qbzr-0.22.2/debian/control --- qbzr-0.22.1/debian/control 2012-02-21 17:06:00.000000000 +0000 +++ qbzr-0.22.2/debian/control 2012-04-06 23:46:45.000000000 +0000 @@ -3,7 +3,6 @@ Priority: optional Maintainer: Debian Bazaar Maintainers Uploaders: Stefano Karapetsas , - Jelmer Vernooij , Andrew Starr-Bochicchio Build-Depends: debhelper (>= 7.0.50~), gettext, @@ -15,7 +14,7 @@ xauth, xvfb Build-Depends-Indep: bzr (>= 2.1), python-bzrlib.tests | bzr (<= 2.4.0~beta1-2) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 X-Python-Version: >= 2.4 Vcs-Bzr: http://anonscm.debian.org/bzr/bzr/pkg-bazaar/qbzr/unstable/ Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-bazaar/qbzr/unstable/files diff -Nru qbzr-0.22.1/debian/copyright qbzr-0.22.2/debian/copyright --- qbzr-0.22.1/debian/copyright 2012-02-21 17:06:00.000000000 +0000 +++ qbzr-0.22.2/debian/copyright 2012-04-06 23:33:14.000000000 +0000 @@ -1,75 +1,66 @@ -This package was debianized by Lukáš Lalinský on -Sun, 10 Nov 2007 15:26:02 +0100. - -It was downloaded from http://bazaar-vcs.org/QBzr - -Files: *.py (except below) -Authors: Lukáš Lalinský - Gary van der Merwe - Alexander Belchenko - Javier Derderian - Mark Hammond - Ian Clatworthy - Craig Hewetson - Ohad Kammar - John Szakmeister - Naoki INADA -Copyright: Copyright © 2006-2008 Lukáš Lalinský - Copyright © 2007-2009 Alexander Belchenko - Copyright © 2005,2009 Canonical Ltd - Copyright © 2006-2008 Gary van der Merwe - Copyright © 2006-2007 Trolltech ASA - Copyright © 2006 Jelmer Vernooij - Copyright © 2005 Dan Loda - Copyright © 2004-2006 Christopher Lenz - Copyright © 2009 Mark Hammond -License: - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY 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 package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in '/usr/share/common-licenses/GPL-2'. - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Qbzr +Source: https://launchpad.net/qbzr +Upstream-Contact: Alexander Belchenko + +Files: * +Copyright: 2006-2008, Lukáš Lalinský + 2007-2009, Alexander Belchenko + 2005,2009, Canonical Ltd + 2006-2008, Gary van der Merwe + 2006-2007, Trolltech ASA + 2006, Jelmer Vernooij + 2005, Dan Loda + 2004-2006, Christopher Lenz + 2009, Mark Hammond +License: GPL-2+ Files: lib/tests/modeltest.py -Copyright: Copyright © 2007 Trolltech ASA -License: - This file is part of the Qt Concurrent project on Trolltech Labs. - - This file may be used under the terms of the GNU General Public - License version 2.0 as published by the Free Software Foundation - and appearing in the file LICENSE.GPL included in the packaging of - this file. Please review the following information to ensure GNU - General Public Licensing requirements will be met: - http://www.trolltech.com/products/qt/opensource.html - - If you are unsure which license is appropriate for your use, please - review the following information: - http://www.trolltech.com/products/qt/licensing.html or contact the - sales department at sales@trolltech.com. - - This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - -On Debian systems, the complete text of the GNU General -Public License can be found in '/usr/share/common-licenses/GPL-2'. - +Copyright: 2007, Trolltech ASA +License: GPL-2 + This file is part of the Qt Concurrent project on Trolltech Labs. + . + This file may be used under the terms of the GNU General Public + License version 2.0 as published by the Free Software Foundation + and appearing in the file LICENSE.GPL included in the packaging of + this file. Please review the following information to ensure GNU + General Public Licensing requirements will be met: + http://www.trolltech.com/products/qt/opensource.html + . + If you are unsure which license is appropriate for your use, please + review the following information: + http://www.trolltech.com/products/qt/licensing.html or contact the + sales department at sales@trolltech.com. + . + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + . + On Debian systems, the complete text of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-2'. Files: docs/rst2html.py -Author: David Goodger -Copyright: This module has been placed in the public domain. - - -The Debian packaging is © 2007, Lukáš Lalinský -and is licensed under the GPL, see above. +Copyright: Public Domain +License: public-domain + This module has been placed in the public domain. + +Files: debian/* +Copyright: 2007, Lukáš Lalinský +License: GPL-2+ + +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-2'. diff -Nru qbzr-0.22.1/__init__.py qbzr-0.22.2/__init__.py --- qbzr-0.22.1/__init__.py 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/__init__.py 2012-04-05 15:26:01.000000000 +0000 @@ -72,7 +72,7 @@ * bug-url - print full URL to a specific bug, or open it in your browser. """ -version_info = (0, 22, 1, 'final', 0) +version_info = (0, 22, 2, 'final', 0) __version__ = '.'.join(map(str, version_info)) diff -Nru qbzr-0.22.1/installer/qbzr-setup.iss qbzr-0.22.2/installer/qbzr-setup.iss --- qbzr-0.22.1/installer/qbzr-setup.iss 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/installer/qbzr-setup.iss 2012-04-05 15:26:01.000000000 +0000 @@ -8,8 +8,8 @@ AppId=QBzr AppName= QBzr -AppVerName= QBzr 0.22.1 -OutputBaseFilename=qbzr-setup-0.22.1 +AppVerName= QBzr 0.22.2 +OutputBaseFilename=qbzr-setup-0.22.2 SourceDir="..\" OutputDir="." diff -Nru qbzr-0.22.1/lib/commands.py qbzr-0.22.2/lib/commands.py --- qbzr-0.22.1/lib/commands.py 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/lib/commands.py 2012-04-05 15:26:01.000000000 +0000 @@ -301,7 +301,7 @@ takes_options = [ui_mode_option] def _qbzr_run(self, selected_list=None, ui_mode=False): - tree, selected_list = builtins.tree_files(selected_list) + tree, selected_list = WorkingTree.open_containing_paths(selected_list) if selected_list == ['']: selected_list = None self.main_window = AddWindow(tree, selected_list, dialog=False, ui_mode=ui_mode) @@ -315,7 +315,7 @@ takes_options = [ui_mode_option, bzr_option('revert', 'no-backup')] def _qbzr_run(self, selected_list=None, ui_mode=False, no_backup=False): - tree, selected_list = builtins.tree_files(selected_list) + tree, selected_list = WorkingTree.open_containing_paths(selected_list) if selected_list == ['']: selected_list = None self.main_window = RevertWindow(tree, selected_list, dialog=False, @@ -377,7 +377,7 @@ message = f.read().decode(file_encoding or osutils.get_user_encoding()) finally: f.close() - tree, selected_list = builtins.tree_files(selected_list) + tree, selected_list = WorkingTree.open_containing_paths(selected_list) if selected_list == ['']: selected_list = None self.main_window = CommitWindow(tree, selected_list, dialog=False, diff -Nru qbzr-0.22.1/lib/commit.py qbzr-0.22.2/lib/commit.py --- qbzr-0.22.1/lib/commit.py 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/lib/commit.py 2012-04-05 15:26:01.000000000 +0000 @@ -90,9 +90,7 @@ and e_key in (QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return) and (int(e.modifiers()) & QtCore.Qt.ControlModifier)): e.ignore() - # FIXME probably this is ugly hack and main qcommit window - # should explicitly catch Ctrl+Enter by self - self.main_window.do_accept() + self.emit(QtCore.SIGNAL("messageEntered()")) return isShortcut = e.modifiers() & QtCore.Qt.ControlModifier and e.key() == QtCore.Qt.Key_E @@ -344,6 +342,8 @@ # Equivalent for 'bzr commit --message' self.message = TextEdit(spell_checker, message_groupbox, main_window=self) self.message.setToolTip(gettext("Enter the commit message")) + self.connect(self.message, QtCore.SIGNAL("messageEntered()"), + self.do_accept) self.completer = QtGui.QCompleter() self.completer_model = QtGui.QStringListModel(self.completer) self.completer.setModel(self.completer_model) diff -Nru qbzr-0.22.1/lib/diffview.py qbzr-0.22.2/lib/diffview.py --- qbzr-0.22.1/lib/diffview.py 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/lib/diffview.py 2012-04-05 15:26:01.000000000 +0000 @@ -931,8 +931,12 @@ b = fix_last_line(lines[1]) for i, group in enumerate(groups): - i0, i1, j0, j1 = group[0][1], group[-1][2], group[0][3], group[-1][4] - self.cursor.insertText("@@ -%d,%d +%d,%d @@\n" % (i0+1, i1-i0, j0+1, j1-j0), self.monospacedHunkFormat) + if group: + i0, i1, j0, j1 = \ + group[0][1], group[-1][2], group[0][3], group[-1][4] + self.cursor.insertText( + "@@ -%d,%d +%d,%d @@\n" % (i0+1, i1-i0, j0+1, j1-j0), + self.monospacedHunkFormat) for tag, i0, i1, j0, j1 in group: if tag == "equal": text = "".join(" " + l for l in a[i0:i1]) diff -Nru qbzr-0.22.1/lib/getnew.py qbzr-0.22.2/lib/getnew.py --- qbzr-0.22.1/lib/getnew.py 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/lib/getnew.py 2012-04-05 15:26:01.000000000 +0000 @@ -23,7 +23,8 @@ import os import re -from PyQt4 import QtCore +from PyQt4 import QtCore, QtGui +from bzrlib.plugins.qbzr.lib.i18n import gettext from bzrlib.plugins.qbzr.lib.subprocess import SubProcessDialog from bzrlib.plugins.qbzr.lib.ui_new_tree import Ui_NewWorkingTreeForm from bzrlib.plugins.qbzr.lib.util import ( @@ -130,3 +131,22 @@ self.process_widget.do_start(None, *args) save_pull_location(None, from_location) + + def validate(self): + # This is a check if the user really wants to checkout to a non-empty directory. + # Because this may create conflicts, we want to make sure this is intended. + to_location = unicode(self.ui.to_location.text()) + if os.path.exists(to_location) and os.listdir(to_location): + if self.ui.but_checkout.isChecked(): + msg = gettext("Do you really want to checkout into a non-empty folder?") + else: + msg = gettext("Do you really want to branch into a non-empty folder?") + choice = QtGui.QMessageBox.question(self, + self.windowTitle(), + msg, + QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, + QtGui.QMessageBox.No) + if choice == QtGui.QMessageBox.No: + return False + + return True diff -Nru qbzr-0.22.1/lib/run.py qbzr-0.22.2/lib/run.py --- qbzr-0.22.1/lib/run.py 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/lib/run.py 2012-04-05 15:26:01.000000000 +0000 @@ -248,8 +248,11 @@ # XXX handle command aliases??? cmd_object = self.cmds_dict.get(cmd_name) if cmd_object: - self.ui.help_browser.setHtml( - get_help_topic_as_html("commands/" + cmd_name)) + # [Bug #963542] get_help_topic_as_html returns valid utf-8 encoded + # HTML document, but QTextBrowser expects unicode. + # (actually QString which is unicode in PyQt4). + html_utf8 = get_help_topic_as_html("commands/" + cmd_name) + self.ui.help_browser.setHtml(html_utf8.decode('utf-8')) else: self.set_default_help() diff -Nru qbzr-0.22.1/lib/widgets/shelve.py qbzr-0.22.2/lib/widgets/shelve.py --- qbzr-0.22.1/lib/widgets/shelve.py 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/lib/widgets/shelve.py 2012-04-05 15:26:01.000000000 +0000 @@ -268,6 +268,8 @@ self.message = TextEdit(spell_checker, message_groupbox, main_window=self) self.message.setToolTip(gettext("Enter the shelve message")) + self.connect(self.message, QtCore.SIGNAL("messageEntered()"), + self.do_shelve) self.completer = QtGui.QCompleter() self.completer_model = QtGui.QStringListModel(self.completer) self.completer.setModel(self.completer_model) @@ -708,7 +710,8 @@ except WorkingTreeHasPendingMarge: QtGui.QMessageBox.warning(self, gettext('Shelve'), - gettext('Operation aborted because working tree has pending marges.'), gettext('&OK')) + gettext('Operation aborted because working tree has pending merges.'), + gettext('&OK')) return except WorkingTreeHasChanged: QtGui.QMessageBox.warning(self, gettext('Shelve'), @@ -1030,8 +1033,8 @@ self.draw_background(rect, painter, scroll_y) - QtGui.QTextBrowser.paintEvent(self, event) del painter + QtGui.QTextBrowser.paintEvent(self, event) def draw_background(self, rect, painter, offset): left, right, width = rect.left(), rect.right(), rect.width() diff -Nru qbzr-0.22.1/NEWS.txt qbzr-0.22.2/NEWS.txt --- qbzr-0.22.1/NEWS.txt 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/NEWS.txt 2012-04-05 15:26:01.000000000 +0000 @@ -1,8 +1,27 @@ +0.22.2 - 2012/04/05 +------------------- +Maintenance release. + + * qrun: + * Localized help text for selected command is shown correctly now. + (Alexander Belchenko, Bug #963542) + * qshelve: + * Pressing Ctrl+Enter in message edit area triggers shelve action. + (IWATA Hidetaka, Bug #936982) + * Hunks are not displayed on Mac OS. (IWATA Hidetaka, Bug #955241) + * qgetnew: + * Ask for verification if a checkout should go to a non-empty + directory - this may cause unwanted conflicts (André Bachmann, Bug #938835) + * qdiff + * Fix - crashes when trying show complete diff of renamed file. (Bug #969055) + * Don't use deprecated API (bzrlib.builtins.tree_files). + (Alexander Belchenko, Bug #776241) + + 0.22.1 - 2012/02/21 ------------------- Just in time for bzr 2.5. - * New command: qignore. (Alexander Belchenko, Bug #524785) @@ -79,14 +98,16 @@ (Workaround for bug #912344, Alexander Belchenko) -0.21.3 - in development ------------------------ +0.21.3 - 2012/04/05 +------------------- Maintenance release. * Avoid AttributeError on 'is_ignored' from treewidget filtering involving unversioned files that have been moved. (Martin Packman, Bug #557603) * Stringify tab_width settings while writing it to branch config. (Workaround for bug #912344, Alexander Belchenko) + * Don't use deprecated API (bzrlib.builtins.tree_files). + (Alexander Belchenko, Bug #776241) 0.21.2 - 2011/12/07 diff -Nru qbzr-0.22.1/po/qbzr-ar.po qbzr-0.22.2/po/qbzr-ar.po --- qbzr-0.22.1/po/qbzr-ar.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-ar.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2010-01-16 13:36+0000\n" "Last-Translator: Ali Sabil \n" "Language-Team: Arabic \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,64 +33,64 @@ msgid "Show ignored files" msgstr "" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "تحميل ..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -113,13 +114,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "تصفح" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -127,20 +128,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "الموقع:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "اظهر" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -152,55 +153,55 @@ msgid "Encoding:" msgstr "ترميز:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -227,8 +228,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" #: lib\commit.py:391 @@ -239,9 +239,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "" @@ -253,10 +253,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "" @@ -282,9 +282,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "" @@ -363,7 +363,7 @@ msgstr "" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "" @@ -383,7 +383,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "" @@ -420,15 +420,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -440,94 +470,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -535,211 +569,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "" msgstr[1] "" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -827,6 +861,51 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "الموقع:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +msgid "Cancelled" +msgstr "" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -881,7 +960,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -939,91 +1018,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1123,9 +1202,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1152,7 +1231,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1177,7 +1256,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1337,100 +1416,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "" -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "" -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1537,86 +1616,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1639,13 +1718,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2048,186 +2120,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-cs.po qbzr-0.22.2/po/qbzr-cs.po --- qbzr-0.22.1/po/qbzr-cs.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-cs.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2009-10-23 12:17+0000\n" "Last-Translator: Kuvaly [LCT] \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Komentovat" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Načítání..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revize %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Procházet" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Umístění:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Ukázat" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -151,55 +152,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -226,8 +227,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" #: lib\commit.py:391 @@ -238,9 +238,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Status" @@ -252,10 +252,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "" @@ -281,9 +281,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "" @@ -362,7 +362,7 @@ msgstr "" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "" @@ -382,7 +382,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "" @@ -419,15 +419,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -439,94 +469,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -534,211 +568,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "" msgstr[1] "" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -826,6 +860,51 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Umístění:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +msgid "Cancelled" +msgstr "" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -880,7 +959,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -938,91 +1017,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1122,9 +1201,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1151,7 +1230,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1176,7 +1255,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1336,100 +1415,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "" -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "" -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1536,86 +1615,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1638,13 +1717,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2047,186 +2119,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-da.po qbzr-0.22.2/po/qbzr-da.po --- qbzr-0.22.1/po/qbzr-da.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-da.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2009-12-06 12:51+0000\n" "Last-Translator: nanker \n" "Language-Team: Danish \n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Vis afviste filer" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Indlæser..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revision %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Gennemse" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Placering:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revision:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Vis" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filtrér" @@ -151,55 +152,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Beskrivelse:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Meddelelse" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -226,8 +227,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" #: lib\commit.py:391 @@ -238,9 +238,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Status" @@ -252,10 +252,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "" @@ -281,9 +281,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "" @@ -362,7 +362,7 @@ msgstr "Kommando" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Fjern" @@ -382,7 +382,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Navn" @@ -419,15 +419,45 @@ msgid "Spell check &language:" msgstr "Stavekontro&l sprog:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Gennemse..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -439,94 +469,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Konflikter" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Fil" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Konflikt" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Alle konflikter løst." -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Fejl" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -534,211 +568,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "sti konflikt" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "indholds konflikt" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "tekst konflikt" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "fjernet" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "tilføjet" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "omdøbt og ændret" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "omdøbt" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "ændret" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Sidst ændret:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Status:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Art:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Egenskaber:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "fjernet" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "tilføjet" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "omdøbt og ændret" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "omdøbt" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "ændret" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Opdater" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fil" msgstr[1] "%d filer" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Luk" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "Ingen ændringer fundet." @@ -826,6 +860,55 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Ignoreret" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "Version" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Ignoreret" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Handling" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Afbryd" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Information" @@ -880,7 +963,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -938,91 +1021,91 @@ msgid "bug #%s" msgstr "fejl #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Tilbagefør" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1122,9 +1205,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1151,7 +1234,7 @@ msgid "Version" msgstr "Version" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Beskrivelse" @@ -1176,7 +1259,7 @@ msgid "(no description)" msgstr "(ingen beskrivelse)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1336,100 +1419,100 @@ msgid "Revisions:" msgstr "Revision:" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "Klar" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Starter..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Afbryder..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Færdig!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Angiv adgangskode" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "Angiv brugernavn" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Fejlede!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Kunne ikke starte bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Fejl ved kørsel af bzr. (fejl kode: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "Afbrudt!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "Skift" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1536,86 +1619,86 @@ msgid "x-bit" msgstr "x-bit" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "Filnavn" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Uændret" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Ændret" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Ignoreret" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "&Åben" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "&Vis fil" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "Vis &log" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "&Tilføj" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Tilbageført" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "&Omdøb" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "&Markér som flyttet og omdøbt" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "&Markér som flyttet" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "&Markér som omdøbt" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Vælg / fravælg alle" @@ -1638,13 +1721,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Gennemse..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Til:" @@ -2047,186 +2123,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Færdig" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-de.po qbzr-0.22.2/po/qbzr-de.po --- qbzr-0.22.1/po/qbzr-de.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-de.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2011-07-17 13:43+0000\n" "Last-Translator: André Bachmann \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Ignorierte Dateien zeigen" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Beschreibe" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Lade..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "Zeichenkodierung" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "Suchen" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "Gehe zu Zeile" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "Ansichtsoptionen" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "Zeilenumbruch" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revision %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "Gehe zu Zeile: " -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "Weiter" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Anmerkung zu dieser Revision" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "Binden an:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Durchsuchen" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Speicherort des Zweiges wählen" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "Ort des Hauptzweiges nicht angegeben" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Speicherort:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revision:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Anzeigen" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filtern" @@ -151,21 +152,21 @@ msgid "Encoding:" msgstr "Zeichenkodierung:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Committen" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Zweig" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "&Lokaler Commit" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -173,35 +174,35 @@ "Lokale Commits werden nicht zum Hauptzweig hochgereicht, bis ein normaler " "Commit durchgeführt wird" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Beschreibung:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "Aktualisieren" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Nachricht" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Nicht versionierte Dateien zeigen" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Commit-Nachricht eingeben" @@ -231,11 +232,10 @@ "Autor dieser Änderung setzen, falls er sich vom Committer unterscheidet" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" -"Gib den Namen des Autoren an, z.B. Hans Müller " -"<hmueller@beispiel.de>" +"Gib den Namen des Autoren an, z.B. Hans Müller <hmueller@beispiel." +"de>" #: lib\commit.py:391 msgid "Changes" @@ -245,9 +245,9 @@ msgid "Pending Merges" msgstr "Ausstehende Zusammenführungen" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Status" @@ -259,10 +259,10 @@ msgid "You should provide a commit message." msgstr "Sie sollten einen Commit-Kommentar eingeben." -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -294,9 +294,9 @@ "Ein lokaler Commit wird durchgeführt. Der Hauptzweig wird solange nicht " "aktualisiert, wie ein nicht-lokaler Commit ausgeführt wird." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Diff" @@ -375,7 +375,7 @@ msgstr "Befehl" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Entfernen" @@ -396,7 +396,7 @@ msgid "External Diff Apps:" msgstr "Externe Applikationen für Dateiunterschiede:" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Name" @@ -433,15 +433,46 @@ msgid "Spell check &language:" msgstr "&Sprache für Rechtschreibung:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Durchsuchen..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +#, fuzzy +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "Dieser Ordner ist ein Checkout von: %s" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Eingebaute Differenzanzeige" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -453,94 +484,99 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "Wählen Sie eine Editor Ausführungsdatei" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "Dieser Ordner ist ein Checkout von: %s" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Konflikte" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Datei" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Konflikt" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "&Starten..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "V&erschmelzungs-Werkzeug:" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Automatisch auflösen" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "&Verschmelzungskonflikt" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "Markiere als &gelöst" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d Konflikt automatisch aufgelöst." msgstr[1] "%d Konflikte automatisch aufgelöst." -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Alle Konflikte gelöst" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Fehler während der Ausführung vom Verschmelzungswerkzeug (code %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Fehler" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -551,199 +587,199 @@ "Missing the flag: %(flags)s. This must be fixed in qconfig under the Merge " "tab." -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "Fehlender Schalter: %s. Einstellen in qconfig im Zusammenführen-Tab." -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "Pfadkonflikt" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "Inhaltskonflikt" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "Textkonflikt" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "Doppelte ID" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "Duplikat" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "Eltern-Schleife" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "fehlender Parent" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "lösche Parent" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "kein-Ordner parent" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Unterschie&de zeigen" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "entfernt" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "hinzugefügt" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "umbenannt und verändert" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "umbenannt" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "verändert" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Letzte Änderung:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Status:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Art:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Eigenschaften:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ Kein Zeilenumbruch am Ende der Datei" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Arbeitsbaum für %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Arbeitsbaum" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Rev %(rev)s für %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "Revid: %(revid)s für %(branch)s" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "Revid: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Zusammenführungsvorschau" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "entfernt" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "hinzugefügt" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "umbenannt und verändert" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "umbenannt" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "verändert" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unidiff" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "Aktualisieren" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d Datei" msgstr[1] "%d Dateien" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -752,12 +788,12 @@ "Datei %s ist nicht versioniert.\n" "Operation abgebrochen." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Schließen" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "Keine Änderungen gefunden." @@ -845,6 +881,56 @@ msgid "No changes selected to revert" msgstr "Keine Änderungen zum Zurücksetzen ausgewählt." +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Ignoriert" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Nicht versionierte Dateien" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "Version" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Ignoriert" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Aktion" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Abbrechen" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Info" @@ -899,7 +985,7 @@ msgid "Messages and File text (indexed)" msgstr "Nachrichten und Datei-Text (indexiert)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Zeige &Unterschiede …" @@ -959,91 +1045,91 @@ msgid "bug #%s" msgstr "Fehler #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "Zeige Unterschie&de in Datei" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Zeige alle &Unterschiede" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "Zeige Unterschie&de in Datei" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "Zeige alle &Unterschiede …" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Zeige Baum..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "Tag &Revision..." -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "Zu dieser Revision &zurücksetzen" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "Zu Revision %s revid:%s zurücksetzen." -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "%s zu Revision %s revid:%s zurücksetzen." -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Zurücksetzen" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1143,14 +1229,14 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" "QBzr — Eine grafische Benutzeroberfläche für Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský und andere

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský und andere

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1176,7 +1262,7 @@ msgid "Version" msgstr "Version" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Beschreibung" @@ -1201,7 +1287,7 @@ msgid "(no description)" msgstr "(keine Beschreibung)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "Arbeitsbaum hat nicht übertragene Änderungen" @@ -1361,100 +1447,100 @@ msgid "Revisions:" msgstr "Revisionen:" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "Bereit" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Startet..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Bricht ab..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Fertig!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Trage Passwort ein" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Misserfolg!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Bzr konnte nicht gestartet werden" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Fehler bei der Ausführung von bzr. (Fehler-Code: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "Abgebrochen!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "Schwergewichtiger Checkout:" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "Leichtgewichtiger Checkout" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "Checkout des Zweiges:" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "Wechseln zum Zweig:" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1567,86 +1653,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "Dateiname" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Unverändert" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Geändert" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "Nicht versioniert" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Ignoriert" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "&Öffnen" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "Datei &anzeigen" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "&Anmerkungen zeigen" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "&Protokoll anzeigen" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "Konflikt als ge&löst markieren" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "&Hinzufügen" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Zurücksetzen" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "&Umbenennen" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "Als verschoben und umbenannt &markieren" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "Als verschoben &markieren" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "Als umbenannt &markieren" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Alle an-/abwählen" @@ -1669,13 +1755,6 @@ msgid "&From:" msgstr "&Von:" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Durchsuchen..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2083,186 +2162,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Vollständig" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" @@ -2312,7 +2391,6 @@ #~ msgid "Location has no working tree" #~ msgstr "Ort hat keinen Arbeitsbaum" -#, python-format #~ msgid "%s (Configured external merge definition in qconfig)" #~ msgstr "" #~ "%s (Eingestellt als externe Definition zum Zusammenführen in qconfig)" @@ -2327,8 +2405,8 @@ #~ "Verschmelzung' Datei.\n" #~ "Es verfolgt die Konvention in der Bzr Erweiterung: extmerge\n" #~ "external_merge = kdiff3 --output %r %b %t %o\n" -#~ "%r ist die Ausgabe, %b ist die .BASIS, %t ist .DIESE und %o ist die .ANDERE " -#~ "Datei." +#~ "%r ist die Ausgabe, %b ist die .BASIS, %t ist .DIESE und %o ist die ." +#~ "ANDERE Datei." #~ msgid "&Related Branches" #~ msgstr "&Verwandte Zweige" diff -Nru qbzr-0.22.1/po/qbzr-en_GB.po qbzr-0.22.2/po/qbzr-en_GB.po --- qbzr-0.22.1/po/qbzr-en_GB.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-en_GB.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2010-01-29 10:13+0000\n" "Last-Translator: Dr Al \n" "Language-Team: English (United Kingdom) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Show ignored files" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Annotate" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Loading..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revision %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Annotate this revision" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "Bind to:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Browse" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Select branch location" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "Master branch location not specified." -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Location:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revision:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Show" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filter" @@ -151,21 +152,21 @@ msgid "Encoding:" msgstr "Encoding:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Commit" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Branch" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "&Local commit" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -173,35 +174,35 @@ "Local commits are not pushed to the master branch until a normal commit is " "performed" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Description:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Message" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Show non-versioned files" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Enter the commit message" @@ -230,10 +231,8 @@ msgstr "Set the author of this change, if it's different from the committer" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" -msgstr "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgstr "Enter the author's name, e.g. John Doe <jdoe@example.com>" #: lib\commit.py:391 msgid "Changes" @@ -243,9 +242,9 @@ msgid "Pending Merges" msgstr "Pending Merges" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Status" @@ -257,10 +256,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -292,9 +291,9 @@ "A local commit to the branch will be performed. The master branch will not " "be updated until a non-local commit is made." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Diff" @@ -373,7 +372,7 @@ msgstr "Command" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Remove" @@ -393,7 +392,7 @@ msgid "External Diff Apps:" msgstr "External Diff Applications:" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Name" @@ -430,15 +429,46 @@ msgid "Spell check &language:" msgstr "Spell check &language:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Browse..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +#, fuzzy +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "This directory is a checkout of: %s" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Builtin Diff" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -450,94 +480,99 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "Select editor executable" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "This directory is a checkout of: %s" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Conflicts" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "File" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Conflict" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "&Launch..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "M&erge tool:" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Auto-resolve" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "&Merge conflict" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "Mark as &resolved" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d conflict auto-resolved." msgstr[1] "%d conflicts auto-resolved." -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "All conflicts resolved." -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Error while running merge tool (code %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Error" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "Set up external_merge application in qconfig under the Merge tab" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -548,199 +583,199 @@ "Missing the flag: %(flags)s. This must be fixed in qconfig under the Merge " "tab." -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "Missing the flag: %s. Configure in qconfig under the merge tab." -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "path conflict" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "contents conflict" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "text conflict" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "duplicate id" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "duplicate" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "parent loop" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "unversioned parent" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "missing parent" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "deleting parent" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "non-directory parent" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Show &differences" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "removed" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "added" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "renamed and modified" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "renamed" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "modified" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Last modified:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Status:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Kind:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Properties:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ No newline at end of file" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Working Tree for %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Working Tree" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Rev %(rev)s for %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "Revid: %(revid)s for %(branch)s" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "Revid: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Merge Preview" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "removed" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "added" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "renamed and modified" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "renamed" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "modified" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unidiff" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Refresh" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d file" msgstr[1] "%d files" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -749,12 +784,12 @@ "File %s is not versioned.\n" "Operation aborted." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Close" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "No changes found." @@ -842,6 +877,56 @@ msgid "No changes selected to revert" msgstr "No changes selected to revert" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Ignored" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Unversioned Files" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "Version" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Ignored" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Action" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Cancel" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Info" @@ -896,7 +981,7 @@ msgid "Messages and File text (indexed)" msgstr "Messages and File text (indexed)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Show &differences..." @@ -954,91 +1039,91 @@ msgid "bug #%s" msgstr "bug #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "Show file &differences" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Show all &differences" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "Show file &differences..." -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "Show all &differences..." -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Show &tree..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "Tag &revision..." -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Revert" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1138,14 +1223,14 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1171,7 +1256,7 @@ msgid "Version" msgstr "Version" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Description" @@ -1196,7 +1281,7 @@ msgid "(no description)" msgstr "(no description)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "Working tree has uncommitted changes." @@ -1358,100 +1443,100 @@ msgid "Revisions:" msgstr "Revisions:" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "&Retry" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "Ready" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Starting..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Aborting..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Finished!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Enter Password" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "Enter Username" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Failed!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Failed to start bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Error while running bzr. (error code: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "Aborted!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "Switch" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "Switch checkout" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "Heavyweight checkout:" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "Lightweight checkout:" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "Checkout of branch:" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "Switch to branch:" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "Create Branch before switching" @@ -1564,86 +1649,86 @@ msgid "x-bit" msgstr "x-bit" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "File Name" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Unchanged" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Changed" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "Unversioned" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Ignored" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "&Open" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "&View file" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "Show &annotate" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "Show &log" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "Mark conflict &resolved" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "&Add" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Revert" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "Re&name" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "&Mark as moved and renamed" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "&Mark as moved" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "&Mark as renamed" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "Do you really want to revert the selected file(s)?" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "External Merge" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Select / deselect all" @@ -1666,13 +1751,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Browse..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&To:" @@ -2078,186 +2156,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Complete" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" @@ -2285,7 +2363,6 @@ #~ "external_merge = kdiff3 --output %r %b %t %o\n" #~ "%r is output, %b is .BASE, %t is .THIS and %o is .OTHER file." -#, python-format #~ msgid "%s (Configured external merge definition in qconfig)" #~ msgstr "%s (Configured external merge definition in qconfig)" @@ -2311,11 +2388,11 @@ #~ msgstr "Location has no working tree" #~ msgid "" -#~ "Some of the files selected cannot be recoverd if removed. Are you sure you " -#~ "want to remove these files?" +#~ "Some of the files selected cannot be recoverd if removed. Are you sure " +#~ "you want to remove these files?" #~ msgstr "" -#~ "Some of the files selected cannot be recovered if removed. Are you sure you " -#~ "want to remove these files?" +#~ "Some of the files selected cannot be recovered if removed. Are you sure " +#~ "you want to remove these files?" #~ msgid "Submit branch:" #~ msgstr "Submit branch:" diff -Nru qbzr-0.22.1/po/qbzr-en.po qbzr-0.22.2/po/qbzr-en.po --- qbzr-0.22.1/po/qbzr-en.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-en.po 2012-04-05 15:26:01.000000000 +0000 @@ -2,10 +2,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2011-08-03 08:37+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,64 +27,64 @@ msgid "Show ignored files" msgstr "Show ignored files" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Annotate" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Loading..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "Encoding" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "Find" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "Goto Line" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "&View Options" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "View Options" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "Word Wrap" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "Tab Width" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revision %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "Goto Line: " -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "Go" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "Close Goto Line" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Annotate this revision" @@ -107,13 +108,13 @@ msgid "Bind to:" msgstr "Bind to:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Browse" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Select branch location" @@ -121,20 +122,20 @@ msgid "Master branch location not specified." msgstr "Master branch location not specified." -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Location:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revision:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Show" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filter" @@ -146,21 +147,21 @@ msgid "Encoding:" msgstr "Encoding:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Commit" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Branch" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "&Local commit" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -168,11 +169,11 @@ "Local commits are not pushed to the master branch until a normal commit is " "performed" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Description:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" @@ -182,24 +183,24 @@ "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "Working tree is out of date. To commit, update the working tree." -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "Update" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Message" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Show non-versioned files" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Enter the commit message" @@ -239,9 +240,9 @@ msgid "Pending Merges" msgstr "Pending Merges" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Status" @@ -253,10 +254,10 @@ msgid "You should provide a commit message." msgstr "You should provide a commit message." -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -288,9 +289,9 @@ "A local commit to the branch will be performed. The master branch will not " "be updated until a non-local commit is made." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Diff" @@ -371,7 +372,7 @@ msgstr "Command" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Remove" @@ -391,7 +392,7 @@ msgid "External Diff Apps:" msgstr "External Diff Apps:" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Name" @@ -428,15 +429,46 @@ msgid "Spell check &language:" msgstr "Spell check &language:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Browse..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +#, fuzzy +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "This directory is a checkout of: %s" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Builtin Diff" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "Import old external merge tool" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -455,94 +487,99 @@ "\n" " %(new_cmdline)s" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "old_cmdline" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "&Ignore and proceed" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "&Change the values" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "Select editor executable" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "This directory is a checkout of: %s" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "Command Line" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Conflicts" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "File" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Conflict" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "&Launch..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "M&erge tool:" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Auto-resolve" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "&Merge conflict" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "Mark as &resolved" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d conflict auto-resolved." msgstr[1] "%d conflicts auto-resolved." -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "All conflicts resolved." -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Error while running merge tool (code %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Error" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "Bazaar 2.4 or later is required for external mergetools support" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "Set up external_merge app in qconfig under the Merge tab" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "External merge tool %(tool)s is not available" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -553,199 +590,199 @@ "Missing the flag: %(flags)s. This must be fixed in qconfig under the Merge " "tab." -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "Missing the flag: %s. Configure in qconfig under the merge tab." -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "path conflict" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "contents conflict" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "text conflict" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "duplicate id" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "duplicate" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "parent loop" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "unversioned parent" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "missing parent" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "deleting parent" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "non-directory parent" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Show &differences" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "removed" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "added" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "renamed and modified" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "renamed" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "modified" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Last modified:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Status:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Kind:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Properties:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "[binary file (%d bytes)]" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ No newline at end of file" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Working Tree for %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Working Tree" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Rev %(rev)s for %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "Revid: %(revid)s for %(branch)s" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "Revid: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Merge Preview" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "removed" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "added" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "renamed and modified" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "renamed" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "modified" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "&Find" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "Find on active panel" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unidiff" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "Toggle between Side by side and Unidiff view modes" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Refresh" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "&External Diff" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "Launch an external diff application" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "&Complete" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "Tab width" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "Left side tab width" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "Right side tab width" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "Left side encoding" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "Right side encoding" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "&Ignore whitespace changes" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d file" msgstr[1] "%d files" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -754,12 +791,12 @@ "File %s is not versioned.\n" "Operation aborted." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Close" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "No changes found." @@ -847,6 +884,58 @@ msgid "No changes selected to revert" msgstr "No changes selected to revert" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Ignored" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Unversioned Files" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "Version" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Ignored" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Action" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +#, fuzzy +msgid "Case-insensitive pattern" +msgstr "Case sensitive" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Cancel" + +#: lib\ignore.py:228 +#, fuzzy +msgid "No action selected" +msgstr "No changes selected." + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Info" @@ -903,7 +992,7 @@ msgid "Messages and File text (indexed)" msgstr "Messages and File text (indexed)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Show &differences..." @@ -965,91 +1054,91 @@ msgid "bug #%s" msgstr "bug #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "Show file &differences" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Show all &differences" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "Show file &differences..." -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "Show all &differences..." -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Show &tree..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "Tag &revision..." -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "R&evert to this revision" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "&Update to this revision" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "&Cherry pick" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "Re&verse Cherry pick" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "Revert to revision %s revid:%s." -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "Revert %s to revision %s revid:%s." -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Revert" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "Update to revision %s revid:%s." -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "Update %s to revision %s revid:%s." -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "Cherry-pick revisions %s - %s from %s to %s." -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "Cherry-pick" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "Reverse cherry-pick revisions %s - %s" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "Reverse cherry-pick revisions %s - %s in %s." -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "Reverse cherry-pick" @@ -1148,15 +1237,15 @@ #: lib\main.py:407 #, python-format msgid "" -"QBzr — A graphical user interface for Bazaar
Version %" -"(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" -msgstr "" -"QBzr — A graphical user interface for Bazaar
Version %" -"(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"QBzr — A graphical user interface for Bazaar
Version " +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +msgstr "" +"QBzr — A graphical user interface for Bazaar
Version " +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1182,7 +1271,7 @@ msgid "Version" msgstr "Version" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Description" @@ -1207,7 +1296,7 @@ msgid "(no description)" msgstr "(no description)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "Working tree has uncommitted changes." @@ -1369,100 +1458,100 @@ msgid "Revisions:" msgstr "Revisions:" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "Shelve Manager" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "Shelve" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "View shelved changes" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "&Retry" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "Ready" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Starting..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "Could not locate \"bzr.exe\"." -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "Could not locate \"bzr\" script." -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Aborting..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Finished!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Enter Password" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "Enter Username" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Failed!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Failed to start bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Error while running bzr. (error code: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "Aborted!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "Switch" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "Switch checkout" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "Heavyweight checkout:" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "Lightweight checkout:" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "Checkout of branch:" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "Switch to branch:" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "Create Branch before switching" @@ -1575,80 +1664,80 @@ msgid "x-bit" msgstr "x-bit" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "File Name" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Unchanged" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Changed" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "Unversioned" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Ignored" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "&Open" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "&View file" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "Show &annotate" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "Show &log" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "Mark conflict &resolved" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "&Add" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Revert" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "Re&name" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "&Mark as moved and renamed" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "&Mark as moved" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "&Mark as renamed" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "Do you really want to revert the selected file(s)?" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "External Merge" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" @@ -1656,7 +1745,7 @@ "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Select / deselect all" @@ -1679,13 +1768,6 @@ msgid "&From:" msgstr "&From:" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Browse..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&To:" @@ -2091,187 +2173,191 @@ msgid "All commits signed with verifiable keys" msgstr "All commits signed with verifiable keys" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "delete file" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "rename" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "add file" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "modify text" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "modify target" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "modify binary" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "Enter the shelve message" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "Hunks" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Complete" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "Previous hunk" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "Next hunk" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "Use editor" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "Destroy" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "Select all" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "Unselect all" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "&Layout" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "Change editor is not defined." -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "Delete changes of %d file without shelving" msgstr[1] "Delete changes of %d files without shelving" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "Shelve changes of %d file" msgstr[1] "Shelve changes of %d files" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "No changes selected." -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +#, fuzzy +msgid "Operation aborted because working tree has pending merges." msgstr "Operation aborted because working tree has pending marges." -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "Operation aborted because target files has been changed." -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "Edited by change editor.\n" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "Id" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "Ignore whitespace" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "Unshelve" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "Dry run" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "Keep" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "Delete" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "Show filelist" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "Apply changes in shelf[%(id)d], and remove from the shelf" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "Apply changes in shelf[%(id)d], but keep it shelved" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "Remove shelf[%(id)d] without applying" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "Find: " -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "Previous" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "Next" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "Case sensitive" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "Whole words" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "Close find" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "Layout" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "Layout %d" + +#~ msgid "old_cmdline" +#~ msgstr "old_cmdline" diff -Nru qbzr-0.22.1/po/qbzr-es.po qbzr-0.22.2/po/qbzr-es.po --- qbzr-0.22.1/po/qbzr-es.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-es.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2011-02-23 19:37+0000\n" "Last-Translator: Fitoschido \n" "Language-Team: Spanish \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Mostrar archivos ignorados" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Anotar" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Cargando…" -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "Codificación" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "Buscar" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "Ir a la línea" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "&Ver opciones" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "Ver opciones" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "Ajuste de línea" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revisión %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "Ir a la línea: " -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "Ir" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Anotar esta revisión" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "Enlazar a:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Examinar" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Seleccionar ubicación de la rama" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "Localización de rama maestra no especificada." -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Ubicación:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revisión:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Mostrar" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filtro" @@ -151,21 +152,21 @@ msgid "Encoding:" msgstr "Codificación:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Enviar" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Rama" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "Envío &local" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -173,35 +174,35 @@ "Los envíos locales no pueden actualizar la rama principal hasta que se " "genere un envío normal" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Descripción:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "Actualizar" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Mensaje" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Mostrar archivos no versionados" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Introduzca el mensaje de envío" @@ -230,11 +231,10 @@ msgstr "Establezca el autor del cambio, si es diferente del que lo envía" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" -"Introduzca el nombre del autor, ejemplo John Doe " -"<:jdoe@ejemplo.com>" +"Introduzca el nombre del autor, ejemplo John Doe <:jdoe@ejemplo.com>" +"" #: lib\commit.py:391 msgid "Changes" @@ -244,9 +244,9 @@ msgid "Pending Merges" msgstr "Fusiones pendientes" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Estado" @@ -258,10 +258,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&Aceptar" @@ -293,9 +293,9 @@ "Un envío local será realizado. La rama maestra no será actualizada hasta que " "un envío no-local sea generado." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Diff" @@ -374,7 +374,7 @@ msgstr "Comando" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Eliminar" @@ -395,7 +395,7 @@ msgid "External Diff Apps:" msgstr "Aplicaciones externas de gestión de diferencias" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Nombre" @@ -432,15 +432,46 @@ msgid "Spell check &language:" msgstr "Revisar ortográficamente" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Explorar..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +#, fuzzy +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "Este directorio es una rama enlazada de: %s" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Diferencia incorporada" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -452,95 +483,100 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "Seleccionar editor" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "Este directorio es una rama enlazada de: %s" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Conflictos" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Archivo" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Conflicto" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "&Lanzar..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "Herramienta de m&ezclado:" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Auto-resolver" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "Ra&ma en conflicto" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "Marcar como &resuelto" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d conflicto auto-resuelto." msgstr[1] "%d conflictos auto-resueltos." -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Todos los conflictos resueltos." -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Error durante la ejecución de la herramienta de mezclado (code %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Error" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" "Asigne la aplicación de external_merge en qconfig bajo la pestaña de Mezcla" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -551,213 +587,213 @@ "Falta la bandera: %(flags)s. Esto debe ser corregido en qconfig en la ficha " "Combinar correspondencia." -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" "No se encontró la bandera: %s. Configúrela en qconfig bajo la pestaña de " "mezcla." -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "conflicto en la ruta" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "conflicto de contenidos" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "texto conflictivo" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "id duplicado" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "duplicado" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "ciclo padre" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "padre sin versionar" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "no se encuentra el padre" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "borrando padre" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "padre no-directorio" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Mostrar &diferencias" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "eliminado" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "añadido" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "renombrado y modificado" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "renombrado" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "modificado" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Última modificación:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Estado:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Tipo:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Propiedades:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\No hay nueva linea al final del archivo" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Árbol de trabajo para %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Árbol de trabajo" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Revisión %(rev)s para %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "Revid: %(revid)s para %(branch)s" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "Revid: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Vista previa de la fusión" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "eliminado" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "añadido" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "renombrado y modificado" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "renombrado" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "modificado" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Estilo clásico" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "Actualiza&r" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "archivo %d" msgstr[1] "archivos %d" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "Archivo %s no se encuentra bajo control de versiones." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Cerrar" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "No se han encontrado cambios." @@ -845,6 +881,56 @@ msgid "No changes selected to revert" msgstr "No se seleccionaron cambios a revertir" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Ignorado" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Archivos no versionados" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "Versión" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Ignorado" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Acción" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Cancelar" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Información" @@ -899,7 +985,7 @@ msgid "Messages and File text (indexed)" msgstr "Mensajes y texto del Archivo (bajo índice)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Mostrar &diferencias..." @@ -957,91 +1043,91 @@ msgid "bug #%s" msgstr "error #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "Mostrar &diferencias del archivo" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Mostrar todas las &diferencias" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "Mostrar &diferencias del archivo..." -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "Mostrar todas las &diferencias..." -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Mos&trar árbol..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "Etiqueta &revision..." -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Revertir" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1141,14 +1227,14 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" "QBzr — Interfaz gráfica de usuario para Bazaar
Versión " "%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Marca Registrada " -"© 2006-2008 Lukáš Lalinský y otros

http://bazaar-vcs.org/QBzr" +"© 2006-2008 Lukáš Lalinský y otros

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1174,7 +1260,7 @@ msgid "Version" msgstr "Versión" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Descripción" @@ -1199,7 +1285,7 @@ msgid "(no description)" msgstr "(sin descripción)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "Árbol de trabajo tiene cambios sin enviar." @@ -1361,100 +1447,100 @@ msgid "Revisions:" msgstr "Revisiones:" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "&Reintentar" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "Listo" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Iniciando..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Abortando..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "¡Terminado!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Introduzca contraseña" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "Introduzca el nombre de usuario" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "¡Fallido!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Fallo al iniciar bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Error al ejecutar bzr. (código de error: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "¡Abortado!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "Cambiar" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "Cambiar pedido" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "Pedido pesado:" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "Pedido ligero:" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "Pedido de rama:" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "Cambiar a rama:" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "Crear rama antes de cambiar:" @@ -1565,86 +1651,86 @@ msgid "x-bit" msgstr "x-bit" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "Nombre de archivo" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Sin cambios" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Cambiado" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "Sin versionar" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Ignorado" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "&Abrir" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "&Ver archivo" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "Mostrar &anotación" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "Mostrar minuta" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "Marcar conflicto como &resuelto" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "&Agregar" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Revertir" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "Re&nombrar" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "&Marcar como movido o renombrado" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "&Marcar como movido" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "&Marcar como renombrado" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "Realmente desea revertir el/los archivo(s) seleccionado(s)?" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "Mezcla externa" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Seleccionar/deseleccionar todo" @@ -1667,13 +1753,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Explorar..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Para:" @@ -2081,186 +2160,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Terminado" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" @@ -2313,7 +2392,6 @@ #~ msgid "You should provide commit message." #~ msgstr "Debería proporcionar un mensaje de envío" -#, python-format #~ msgid "%s (Configured external merge definition in qconfig)" #~ msgstr "%s (definición externa de mezclado configurada en qconfig)" @@ -2329,7 +2407,8 @@ #~ "external_merge = kdiff3 --output %r %b %t %o\n" #~ "%r is output, %b is .BASE, %t is .THIS and %o is .OTHER file." #~ msgstr "" -#~ "La herramienta de mezclado configurada en qconfig bajo el archivo mezclado.\n" +#~ "La herramienta de mezclado configurada en qconfig bajo el archivo " +#~ "mezclado.\n" #~ "Sigue la convención usada en el plugin: extmerge\n" #~ "external_merge = kdiff3 --output %r %b %t %o\n" #~ "%r es la salida, %b es .BASE, %t es .THIS y %o es el archivo .OTHER" @@ -2341,8 +2420,8 @@ #~ msgstr "Lado derecho de la codificación:" #~ msgid "" -#~ "Some of the files selected cannot be recoverd if removed. Are you sure you " -#~ "want to remove these files?" +#~ "Some of the files selected cannot be recoverd if removed. Are you sure " +#~ "you want to remove these files?" #~ msgstr "" #~ "Algunos de los archivos seleccionados no pueden ser recuperados si se " #~ "eliminan. ¿Está seguro que desea eliminar esos archivos?" diff -Nru qbzr-0.22.1/po/qbzr-et.po qbzr-0.22.2/po/qbzr-et.po --- qbzr-0.22.1/po/qbzr-et.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-et.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2010-03-26 09:54+0000\n" "Last-Translator: René Pärts \n" "Language-Team: Estonian \n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Näita eiratud faile" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Annoteeri" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Laadimine..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Versioon %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Annoteeri see versioon" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "Köidetud:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Lehitse" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Vali haru asukoht" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "Ülemharu asukohta pole määratud." -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Asukoht:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Versioon:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Näita" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filtreeri" @@ -151,21 +152,21 @@ msgid "Encoding:" msgstr "Kodeering:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Kanna sisse" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Haru" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "&Kohalik sissekanne" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -173,35 +174,35 @@ "Kohalikud sissekanded pole ülemharusse pandud kuniks tavaline sissekanne on " "tehtud" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Kirjeldus:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Sõnum" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Näita versioonita faile" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Sisesta sissekande sõnum" @@ -230,8 +231,7 @@ msgstr "Määra muudatusele sissekandjast erinev autor" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" "Sisesta autori nimi nagu näiteks John Doe <jdoe@example.com>" @@ -243,9 +243,9 @@ msgid "Pending Merges" msgstr "Ootel ühendused" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Olek" @@ -257,10 +257,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -292,9 +292,9 @@ "Teostatakse kohalik sissekanne harusse. Ülemharu ei uuendata kuniks tehakse " "mitte-kohalik sissekanne." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Erinevus" @@ -373,7 +373,7 @@ msgstr "Käsk" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Eemalda" @@ -393,7 +393,7 @@ msgid "External Diff Apps:" msgstr "Välised erinevusrakendused:" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Nimi" @@ -430,15 +430,46 @@ msgid "Spell check &language:" msgstr "Õigekirja kontroll &keel:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Lehitse..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +#, fuzzy +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "See kataloog on %s väljavõte" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Sisseehitatud võrdlus" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -450,94 +481,99 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "Vali käivitatav redaktor" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "See kataloog on %s väljavõte" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Konfliktid" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Fail" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Konflikt" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "&Käivita..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "L&iitmise tööriist:" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Automaatne lahendamine" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "&Liida konflikt" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "Märgi &lahendatuks" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d konflikt on automaatselt lahendatud." msgstr[1] "%d konflikti on automaatselt lahendatud." -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Kõik konfliktid on lahendatud." -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Liitmise tööriista (code %d) käivitamisel tekkis viga" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Viga" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "Määra external_merge rakendus qconfig'is liitmise kaardil" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -548,199 +584,199 @@ "Kadunud märgistus: %(flags)s. See peab olema fikseeritud qconfig'i liitmise " "kaardis." -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "Kadunud märgistus: %s. Seadista qconfig'i liitmise kaardis." -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "asukohakonflikt" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "sisukonflikt" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "tekstikonflikt" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "dubleeri id" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "duplikaat" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "ülemkordus" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "versioonita ülem" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "kadunud ülem" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "ülema kustutamine" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "kataloogita ülem" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Näita &erinevusi" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "eemaldatud" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "lisatud" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "ümbernimetatud ja muudetud" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "ümbernimetatud" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "muudetud" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Viimati muudetud:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Olek:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Laad:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Atribuudid:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ Faili lõpus reavahetus puudub" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Tööpuu %s jaoks" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Tööpuu" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Rev %(rev)s %(branch)s jaoks" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "Revid: %(revid)s %(branch)s jaoks" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "Revid: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Liida eelvaade" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "eemaldatud" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "lisatud" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "ümbernimetatud ja muudetud" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "ümbernimetatud" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "muudetud" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unidiff" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Värskenda" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fail" msgstr[1] "%d faili" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -749,12 +785,12 @@ "Fail %s ei ole versioonitud.\n" "Operatsioon on katkestatud." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Sulge" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "Muudatusi ei leitud." @@ -842,6 +878,56 @@ msgid "No changes selected to revert" msgstr "Valitud muudatusi tühistamiseks ei leitud" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Ignoreeritud" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Versioonita failid" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "Versioon" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Ignoreeritud" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Toiming" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Katkesta" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Info" @@ -896,7 +982,7 @@ msgid "Messages and File text (indexed)" msgstr "Sõnumid ja faili tekst (indekseeritud)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Näita &erinevusi..." @@ -954,91 +1040,91 @@ msgid "bug #%s" msgstr "viga #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "Näita faili &erinevusi" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Näita kõiki &erinevusi" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "Näita faili &erinevusi..." -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "Näita kõiki &erinevusi..." -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Näita &puud..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "Silt &versioon..." -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "&Võta tagasi" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1138,14 +1224,14 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" "QBzr — Graafiline Bazaari kasutajaliides
Versioon " "%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Autoriõigus © " -"2006-2008 Lukáš Lalinský ja teised

http://bazaar-vcs.org/QBzr" +"2006-2008 Lukáš Lalinský ja teised

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1171,7 +1257,7 @@ msgid "Version" msgstr "Versioon" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Kirjeldus" @@ -1196,7 +1282,7 @@ msgid "(no description)" msgstr "(kirjeldus puudub)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "Tööpuul on sissekandmata muudatused." @@ -1358,100 +1444,100 @@ msgid "Revisions:" msgstr "Versioonid:" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "&Proovi uuesti" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "Valmis" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Alustamine..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Katkestamine..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Valmis!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Sisesta parool" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "Sisesta kasutajanimi:" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Ebaõnnestus!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Bzr'i käivitamine nurjus" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Bzr käivitamisel tekkis viga. (vea kood: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "Katkenud!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "Lülita" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "Lülita väljavõttesse" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "Väga põhjalik väljavõte:" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "Vähem põhjalik väljavõte:" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "Haru väljavõte:" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "Lülita harusse:" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "Loo enne lülitamist haru" @@ -1564,86 +1650,86 @@ msgid "x-bit" msgstr "x-bit" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "Faili nimi" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Muutmata" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Muudetud" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "Versioonita" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Ignoreeritud" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "&Ava" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "&Vaata faili" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "Näita &annoteerimist" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "Näita &logi" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "Märgi konflikt &lahendatuks" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "&Lisa" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Tühista" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "&Nimeta ümber" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "&Märgi liigutatuks ja ümbernimetatuks" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "&Märgi liigutatuks" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "&Märgi ümbernimetatuks" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "Kas sa tõesti soovid valitud faili(d) tagasi võtta?" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "Väline liitmine" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Vali / ära vali kõik" @@ -1666,13 +1752,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Lehitse..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Kellele:" @@ -2076,186 +2155,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Valmis" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" @@ -2296,8 +2375,8 @@ #~ msgstr "Asukohal puudub tööpuu" #~ msgid "" -#~ "Some of the files selected cannot be recoverd if removed. Are you sure you " -#~ "want to remove these files?" +#~ "Some of the files selected cannot be recoverd if removed. Are you sure " +#~ "you want to remove these files?" #~ msgstr "" #~ "Mõningaid valitud faile ei olnud võimalik taastada. Oled sa kindel, et sa " #~ "soovid need failid eemaldada?" @@ -2326,7 +2405,6 @@ #~ msgid "External Merge Apps:" #~ msgstr "Välised liitmisrakendused:" -#, python-format #~ msgid "%s (Configured external merge definition in qconfig)" #~ msgstr "%s (Seadistatud välise liitmise definitsioon qconfig'is)" diff -Nru qbzr-0.22.1/po/qbzr-fr.po qbzr-0.22.2/po/qbzr-fr.po --- qbzr-0.22.1/po/qbzr-fr.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-fr.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2010-05-17 17:17+0000\n" "Last-Translator: François Blondel \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Montrer les fichiers ignorés" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Annoter" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Chargement..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Version n° %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Annoter cette révision" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "Liée à :" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Parcourir" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Choisissez l'emplacement de la branche" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "Emplacement de la branche liée manquant." -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Emplacement :" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Révision :" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Afficher" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filtrer" @@ -151,21 +152,21 @@ msgid "Encoding:" msgstr "Encodage :" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Commiter" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Branche" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "Commit &local" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -173,35 +174,35 @@ "Les commits locaux ne seront poussés sur la branche principale que lors d'un " "commit normal" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Description :" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Message" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Montrer les fichiers non-versionnés" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Entrez le message de commit" @@ -230,11 +231,10 @@ msgstr "Définit l'auteur des changements s'il est différent du commiteur" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" -"Saisissez le nom de l'auteur, par exemple John Doe " -"<jdoe@example.com>" +"Saisissez le nom de l'auteur, par exemple John Doe <jdoe@example." +"com>" #: lib\commit.py:391 msgid "Changes" @@ -244,9 +244,9 @@ msgid "Pending Merges" msgstr "Merges en attente" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "État" @@ -259,10 +259,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -294,9 +294,9 @@ "Un enregistrement local vers la branche va être fait. La branche principale " "ne sera pas mise à jour jusqu'à ce qu'un enregistrement non-local soit fait." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Diff" @@ -375,7 +375,7 @@ msgstr "Commandes" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Supprimer" @@ -395,7 +395,7 @@ msgid "External Diff Apps:" msgstr "Applications de comparaison externes :" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Nom" @@ -432,15 +432,45 @@ msgid "Spell check &language:" msgstr "Correction d'orthographe $language" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Parcourir…" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Application de comparaison par défaut" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -452,94 +482,99 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "Choisir le répertoire cible" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Conflits" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Fichier" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Conflit" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "&Démarrer..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "Outil d&e fusion :" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Résoudre automatiquement" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "Conflit de &fusion" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "Marquer comme &résolu" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d conflit résolu automatiquement." msgstr[1] "%d conflits résolus automatiquement." -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Tous les conflits on été résolus." -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Erreur lors de l'exécution de l'application de fusion (code %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Erreur" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -547,199 +582,199 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "conflit sur le chemin" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "conflit sur le contenu" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "conflit sur le texte" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "id en doublon" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "dupliquer" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "parent manquant" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "suppression du parent" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Montrer les &différences" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "supprimé" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "ajouté(e)" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "renommé et modifié" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "renommé" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "modifié" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Dernière modification :" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "État :" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Type :" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Propriétés :" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ Pas de retour à la ligne à la fin du fichier" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Arbre de travail pour %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Arbre de Travail" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Version %(rev)s pour la branche %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Aperçu de la fusion" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "supprimé" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "ajouté(e)" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "renommé et modifié" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "renommé" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "modifié" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Actualiser" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fichier" msgstr[1] "%d fichiers" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -748,12 +783,12 @@ "Le fichier %s n'est pas sous contrôle de version.\n" "Opération annulée." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Fermer" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "Aucun changement détecté." @@ -841,6 +876,55 @@ msgid "No changes selected to revert" msgstr "Aucuns changements sélectionnés pour l'annulation" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Ignoré" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Fichiers non-versionnés" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Ignoré" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Action" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Annuler" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Information" @@ -895,7 +979,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Montrer les &différences…" @@ -953,91 +1037,91 @@ msgid "bug #%s" msgstr "bogue #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Rétablir" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1137,9 +1221,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1166,7 +1250,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Description" @@ -1191,10 +1275,9 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." -msgstr "" -"L'arborescence du travail contient des modifications non-enregistrées" +msgstr "L'arborescence du travail contient des modifications non-enregistrées" #: lib\pull.py:256 msgid "Working tree is out of date, please run 'bzr update'." @@ -1355,100 +1438,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Démarrage..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Interruption en cours..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Terminé !" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Saisir le mot de passe" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Échec !" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Erreur lors de l'exécution de bzr. Code d'erreur : %d" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1555,86 +1638,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "Nom de fichier" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Inchangé" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Modifié" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Ignoré" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "&Ouvrir" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "&Ajouter" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Revenir" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1657,13 +1740,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Parcourir…" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&À :" @@ -2066,186 +2142,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Complet" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-gl.po qbzr-0.22.2/po/qbzr-gl.po --- qbzr-0.22.1/po/qbzr-gl.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-gl.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2009-10-08 15:32+0000\n" "Last-Translator: Fran Diéguez \n" "Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Mostrar ficheiros ignorados" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Annotate" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "A cargar..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revisión %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Anotar esta revisión" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Examinar" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Ubicación:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revisión:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Amosar" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -151,55 +152,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Entregar" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Mensaxe" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -226,8 +227,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" "Introduza o nome do autor, p.ex. Pepe Perez <:pepe@exemplo.com>:" @@ -239,9 +239,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Estado" @@ -253,10 +253,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&Aceptar" @@ -282,9 +282,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "" @@ -363,7 +363,7 @@ msgstr "Orde" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Eliminar" @@ -383,7 +383,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Nome" @@ -420,15 +420,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -440,94 +470,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Ficheiro" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -535,210 +569,210 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "borrado" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "engadido" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "renomeado e modificado" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "renomeado" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "modificado" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Última modificación:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Estado" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Tipo:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Propiedades" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ Sin liña nova no fin do ficheiro" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "borrado" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "engadido" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "renomeado e modificado" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "renomeado" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "modificado" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "Actualiza&r" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "ficheiro %d" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Pechar" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -826,6 +860,53 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Ficheiros non versionados" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Ubicación:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Cancelar" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -880,7 +961,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Amosar &diferencias..." @@ -938,91 +1019,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Amosar ar&bore" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Reverter" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1122,9 +1203,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1151,7 +1232,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1176,7 +1257,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1336,100 +1417,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "A iniciar..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Interrumpindo..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Rematado!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Fallou!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Atopouse un fallo ao iniciar bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Produciuse un erro ao executar bzr (código de erro: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1536,86 +1617,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1638,13 +1719,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Para:" @@ -2047,186 +2121,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-he.po qbzr-0.22.2/po/qbzr-he.po --- qbzr-0.22.1/po/qbzr-he.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-he.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2008-11-21 23:51+0000\n" "Last-Translator: Yaron \n" "Language-Team: Hebrew \n" +"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "" -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "בחר את מיקום הענף" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -151,55 +152,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "ענף" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -226,8 +227,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" #: lib\commit.py:391 @@ -238,9 +238,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "מצב" @@ -252,10 +252,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "" @@ -281,9 +281,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "שוני" @@ -362,7 +362,7 @@ msgstr "" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "" @@ -382,7 +382,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "" @@ -419,15 +419,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "עיון..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -439,94 +469,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "קובץ" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "שגיאה" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -534,199 +568,199 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "הוסר" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "נוסף" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "שונה שמו או ששונה" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "שונה שמו" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "עודכן" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "עץ העבודה עבור %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "עץ העבודה" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "מהדורה %(rev)s עבור %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "מהדורה %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "מזהה מהדורה: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "תצוגה מקדימה של המיזוג" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "הוסר" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "נוסף" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "שונה שמו או ששונה" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "שונה שמו" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "עודכן" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "שינויי אחידות" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "רע&נן" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "קובץ %d" msgstr[1] "%d קבצים" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -735,12 +769,12 @@ "הקובץ %s אינו מכיל גירסה.\n" "הפעולה בוטלה." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "ס&גור" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -828,6 +862,54 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "בהתעלמות" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "בהתעלמות" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "מ&יקום:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&ביטול" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "מידע" @@ -882,7 +964,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "הצג &שינויים..." @@ -940,91 +1022,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "ה&חזר" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1124,9 +1206,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1153,7 +1235,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "תיאור" @@ -1178,7 +1260,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1338,100 +1420,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "מתחיל..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "מבטל..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "הסתיים!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "נכשל!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "כשל בהפעלת bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "שגיאה בעת הרצת bzr. (קוד השגיאה: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1542,86 +1624,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "בחר / בטל בחירת הכל" @@ -1644,13 +1726,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "עיון..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2053,186 +2128,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "הסתיים" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-hu.po qbzr-0.22.2/po/qbzr-hu.po --- qbzr-0.22.1/po/qbzr-hu.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-hu.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2010-02-28 13:26+0000\n" "Last-Translator: Krasznecz Zoltán \n" "Language-Team: Hungarian \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Nem mutatott fájlok mutatása" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Megjegyzésekkel ellát" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Betöltés..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Változat %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Ezt a változatot megjegyzésekkel ellát" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "Kötés ide:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Böngészés" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Ág helyének kiválasztása" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "Mester ág helye nincs megadva" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Hely:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Változat:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Megjelenítés" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "S&zűrő" @@ -151,55 +152,55 @@ msgid "Encoding:" msgstr "Kódolás:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Ág" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Leírás:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Üzenet" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Mutasd a verzió nélküli fájlokat" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -226,8 +227,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "Írja be a szerző nevét, pl. John Doe <jdoe@pelda.com>" #: lib\commit.py:391 @@ -238,9 +238,9 @@ msgid "Pending Merges" msgstr "Függőben levő összefűzések" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Állapot" @@ -252,10 +252,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -281,9 +281,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Eltérés" @@ -362,7 +362,7 @@ msgstr "Parancs" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Eltávolítás" @@ -382,7 +382,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Név" @@ -419,15 +419,45 @@ msgid "Spell check &language:" msgstr "&Nyelv helyesírás-ellenőrzése:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -439,94 +469,99 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "Célkönyvtár Kiválasztása" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Ütközések" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Fájl" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Ütközés" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "&Indítás..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Automatikus feloldás" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Minden ütközés feloldva" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Hiba" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -534,211 +569,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "útvonalütközés" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "tartalmi ütközés" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "szövegütközés" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "kétszer előforduló azonosító" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "duplikátum" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "szülő ciklus" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "verzió nélküli szülő" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "hiényzó szülő" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "szülő törlése" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "szülő nem könyvtár" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "eltávolítva" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "hozzáadva" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "átnevezve és módosítva" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "átnevezve" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "módosítva" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Utolsó módosítás:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Állapot:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Típus:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Tulajdonságok:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Munkafa" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "eltávolítva" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "hozzáadva" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "átnevezve és módosítva" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "átnevezve" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "módosítva" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Frissítés" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fájl" msgstr[1] "%d fájlok" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Bezárás" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "Nem találtam változtatást." @@ -826,6 +861,54 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "kihagyva" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Verzió nélküli fájlok" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "kihagyva" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Hely:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +msgid "Cancelled" +msgstr "" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Információ" @@ -880,7 +963,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -938,91 +1021,91 @@ msgid "bug #%s" msgstr "hiba #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Összes mutatása &különbségek" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1122,9 +1205,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1151,7 +1234,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1176,7 +1259,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1336,100 +1419,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "&Újra" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "" -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "" -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Jelszó Megadása" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "Felhasználónév Megadása" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Sikertelen!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "A bzr elindítása sikertelen." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Hiba a bzr futása közben. (Hibakód: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "Megszakítva!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1536,86 +1619,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1638,13 +1721,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2047,186 +2123,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-it.po qbzr-0.22.2/po/qbzr-it.po --- qbzr-0.22.1/po/qbzr-it.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-it.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2010-01-17 12:48+0000\n" "Last-Translator: Stefano Karapetsas \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Mostra file ignorati" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Annota" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Caricamento..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revisione %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Annota questa revisione" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "Associa a:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Esplora" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Seleziona posizione branch" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "Posizione del branch principale non specificata." -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Posizione:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revisione:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Mostra" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filtro" @@ -151,21 +152,21 @@ msgid "Encoding:" msgstr "Codifica:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Commit" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Branch" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "Commit &locale" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -173,35 +174,35 @@ "I commit locali non vengono inviati al branch principale finché non viene " "eseguito un commit normale." -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Descrizione:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Messaggio" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Mostra i file non sotto il controllo di versione" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Inserisci il messaggio" @@ -230,11 +231,10 @@ msgstr "Imposta l'autore di questa modifica, se diverso da chi la invia" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" -"Inserisci il nome dell'autore, ad esempio John Doe " -"<jdoe@example.com>" +"Inserisci il nome dell'autore, ad esempio John Doe <jdoe@example." +"com>" #: lib\commit.py:391 msgid "Changes" @@ -244,9 +244,9 @@ msgid "Pending Merges" msgstr "Merge in sospeso" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Stato" @@ -258,10 +258,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -293,9 +293,9 @@ "Verrà eseguito un commit al branch locale. Il branch principale non verrà " "aggiornato finché non verrà eseguito un commit non locale." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Diff" @@ -374,7 +374,7 @@ msgstr "Comando" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Rimuovi" @@ -388,14 +388,13 @@ #: lib\config.py:179 msgid "Show inter-group inserts and deletes in green and red" -msgstr "" -"Mostra inserimenti e eliminazioni nei gruppi interni in verde e rosso" +msgstr "Mostra inserimenti e eliminazioni nei gruppi interni in verde e rosso" #: lib\config.py:181 msgid "External Diff Apps:" msgstr "Applicazioni Esterne per il Diff:" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Nome" @@ -432,15 +431,46 @@ msgid "Spell check &language:" msgstr "&Lingua correzione ortografica:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Esplora..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +#, fuzzy +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "Questa cartella è un checkout di: %s" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Diff Integrato" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -452,94 +482,99 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "Seleziona eseguibile editor" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "Questa cartella è un checkout di: %s" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Conflitti" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "File" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Conflitto" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "Avvia..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "Strumento m&erge:" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Risolvi-automaticamente" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "Conflitto &merge" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "Marca come &risolto" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d conflitto risolto automaticamente." msgstr[1] "%d conflitti risolti automaticamente." -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Tutti i conflitti risolti." -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Errore durante l'esecuzione dello strumento merge (codice %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Errore" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "Imposta applicazione external_merge in qconfig nel tab Merge" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -547,199 +582,199 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "Flag mancante: %s. Configurarlo in qconfig nel tab merge." -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "conflitto di percorso" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "conflitto di contenuto" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "conflitto di testo" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "id duplicato" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "duplicato" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "ciclo genitore" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "genitore non sotto il controllo di versione" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "genitore mancante" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "eliminazione genitore" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "genitore non-cartella" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Mostra &differenze" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "rimosso" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "aggiunto" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "rinominato e modificato" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "rinominato" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "modificato" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Ultima modifica:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Stato:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Tipo:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Proprietà:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ Non c'è una linea vuota alla fine del file" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Albero di lavoro per %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Albero di Lavoro" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Rev %(rev)s per %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "Revid: %(revid)s per %(branch)s" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "Revid: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Anteprima Merge" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "rimosso" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "aggiunto" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "rinominato e modificato" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "rinominato" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "modificato" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Differenze unificate" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "Aggio&rna" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d file" msgstr[1] "%d file" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -748,12 +783,12 @@ "Il file %s non è sotto il controllo di versione.\n" "Operazione abortita." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Chiudi" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "Nessuna modifica trovata." @@ -841,6 +876,56 @@ msgid "No changes selected to revert" msgstr "Nessuna modifica selezionata per il revert" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Ignorato" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "File non sotto il controllo di versione" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "Versione" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Ignorato" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Azione" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Cancella" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Informazioni" @@ -895,7 +980,7 @@ msgid "Messages and File text (indexed)" msgstr "Testo Messaggi e File (indicizzato)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Mostra le &differenze" @@ -953,91 +1038,91 @@ msgid "bug #%s" msgstr "bug #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "Mostra &differenze file" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Mostra tutte le &differenze" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "Mostra &differenze file..." -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "Mostra tutte le &differenze..." -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Mos&tra albero..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "Tag &revisione..." -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Ripristina" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1137,14 +1222,14 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" "QBzr — Un'interfaccia grafica per Bazaar
Versione " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský e altri

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský e altri

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1170,7 +1255,7 @@ msgid "Version" msgstr "Versione" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Descrizione" @@ -1195,7 +1280,7 @@ msgid "(no description)" msgstr "(nessuna descrizione)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "L'albero di lavoro ha delle modifiche senza commit." @@ -1355,100 +1440,100 @@ msgid "Revisions:" msgstr "Revisioni:" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "&Riprova" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "Pronto" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Avvio..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Interruzione..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Finito!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Inserire Password" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "Inserire Nome Utente" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Non riuscito!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Impossibile avviare bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Errore durante l'esecuzione di bzr. (codice di errore: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "Abortito!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "Cambia" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "Cambia checkout" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "Checkout pesante:" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "Checkout leggero:" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "Checkout del branch:" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "Cambia al branch:" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "Crea Branch prima del cambio" @@ -1561,86 +1646,86 @@ msgid "x-bit" msgstr "x-bit" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "Nome File" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Non modificato" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Modificato" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "Non controllato" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Ignorato" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "Apri" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "&Visualizza file" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "Mostra &annotazioni" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "Mostra &log" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "Marca conflitto come &risolto" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "&Aggiungi" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Ripristina" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "Ri&nomina" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "&Marca come spostato e rinominato" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "&Marca come spostato" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "&Marca come rinominato" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "Effettuare il ripristino del/i file selezionato/i?" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "Merge Esterno" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Seleziona / deseleziona tutto" @@ -1663,13 +1748,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Esplora..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&A:" @@ -2078,186 +2156,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Completo" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" @@ -2311,11 +2389,11 @@ #~ msgstr "La posizione non ha un albero di lavoro" #~ msgid "" -#~ "Some of the files selected cannot be recoverd if removed. Are you sure you " -#~ "want to remove these files?" +#~ "Some of the files selected cannot be recoverd if removed. Are you sure " +#~ "you want to remove these files?" #~ msgstr "" -#~ "Alcuni dei file selezionati non possono essere recuperati se eliminati. Si è " -#~ "sicuri di eliminare questi file?" +#~ "Alcuni dei file selezionati non possono essere recuperati se eliminati. " +#~ "Si è sicuri di eliminare questi file?" #~ msgid "Left side encoding:" #~ msgstr "Codifica lato sinistro:" @@ -2332,7 +2410,6 @@ #~ msgid "&Format" #~ msgstr "&Formato" -#, python-format #~ msgid "%s (Configured external merge definition in qconfig)" #~ msgstr "%s (Definizione merge esterno configurato in qconfig)" @@ -2345,5 +2422,5 @@ #~ "Lo strumento merge configurato in qconfig nella pagina Merge.\n" #~ "Segue la convenzione usata nel plugin bzr: extmerge\n" #~ "external_merge = kdiff3 --output %r %b %t %o\n" -#~ "%r è il risultato, %b è il file .BASE, %t è il file .THIS e %o è il file " -#~ ".OTHER." +#~ "%r è il risultato, %b è il file .BASE, %t è il file .THIS e %o è il file ." +#~ "OTHER." diff -Nru qbzr-0.22.1/po/qbzr-ja.po qbzr-0.22.2/po/qbzr-ja.po --- qbzr-0.22.1/po/qbzr-ja.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-ja.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2011-08-04 14:34+0000\n" "Last-Translator: IWATA Hidetaka \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "無視したファイルを表示" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "注釈" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "読み込み中..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "エンコード" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "検索" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "指定行へジャンプ" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "表示オプション(&V)" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "表示オプション" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "行の折り返し" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "タブ文字の幅" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "リビジョン %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "指定行へジャンプ： " -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "移動" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "行指定パネルを閉じる" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "このリビジョンを注釈する(&A)" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "バインド先:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "参照" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "ブランチの場所を選択" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "マスタであるブランチの場所が指定されていません。" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "場所:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "リビジョン:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "表示" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "フィルタ(&F)" @@ -151,58 +152,63 @@ msgid "Encoding:" msgstr "エンコード:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "コミット" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "ブランチ" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "ローカルコミット(&L)" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" -msgstr "通常のコミットが行われるまで、ローカルコミットはマスターブランチへと送られることはありません" +msgstr "" +"通常のコミットが行われるまで、ローカルコミットはマスターブランチへと送られる" +"ことはありません" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "説明:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" "ローカルブランチはマスターブランチよりも古くなっています。\n" -"マスターブランチにコミットするには、まずローカルブランチを更新してください。\n" +"マスターブランチにコミットするには、まずローカルブランチを更新してくださ" +"い。\n" "ローカルコミットを選択してスタンドアロンで作業を続けることもできます。" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." -msgstr "作業ツリーは古くなっています。コミットするには、まず作業ツリーを更新してください。" +msgstr "" +"作業ツリーは古くなっています。コミットするには、まず作業ツリーを更新してくだ" +"さい。" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "更新" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "メッセージ" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "バージョン管理下にないファイルを表示" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "コミットメッセージを入力してください。" @@ -219,7 +225,8 @@ "Enter the list of bug IDs in format tag:id separated by a space, e.g. " "project:123 project:765" msgstr "" -"バグIDのリストを入力する　フォーマットは tag:idでスペースで区切る。例 project:123 project:765" +"バグIDのリストを入力する　フォーマットは tag:idでスペースで区切る。例 " +"project:123 project:765" #: lib\commit.py:372 msgid "&Author:" @@ -230,9 +237,9 @@ msgstr "この変更の著者がコミッターと異なるなら著者を設定" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" -msgstr "著者の名前を入力してください。(例: John Doe <jdoe@example.com>)" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgstr "" +"著者の名前を入力してください。(例: John Doe <jdoe@example.com>)" #: lib\commit.py:391 msgid "Changes" @@ -242,9 +249,9 @@ msgid "Pending Merges" msgstr "マージ保留" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "状態" @@ -256,10 +263,10 @@ msgid "You should provide a commit message." msgstr "コミットメッセージを入力してください" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "OK(&O)" @@ -279,17 +286,20 @@ msgid "" "A commit will be made directly to the master branch, keeping the local and " "master branches in sync." -msgstr "コミットはマスターブランチに送られ、ローカルとマスターブランチ間で同期します" +msgstr "" +"コミットはマスターブランチに送られ、ローカルとマスターブランチ間で同期します" #: lib\commit.py:753 msgid "" "A local commit to the branch will be performed. The master branch will not " "be updated until a non-local commit is made." -msgstr "ブランチへのローカルコミットが行われます。ローカルコミットでないコミットをしない限り、マスターブランチは更新されません。" +msgstr "" +"ブランチへのローカルコミットが行われます。ローカルコミットでないコミットをし" +"ない限り、マスターブランチは更新されません。" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "差分" @@ -370,7 +380,7 @@ msgstr "コマンド" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "削除" @@ -390,7 +400,7 @@ msgid "External Diff Apps:" msgstr "外部の diff プログラム" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "名前" @@ -427,15 +437,46 @@ msgid "Spell check &language:" msgstr "スペルチェック言語(&L):" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "参照..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +#, fuzzy +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "このディレクトリのチェックアウト元： %s" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "組み込みのdiff" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "古いマージツール設定の取り込み" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -451,93 +492,98 @@ "新しい設定:\n" " %(new_cmdline)s" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "そのまま処理を進める(&I)" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "値を変更する(&C)" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "エディタを選択" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "このディレクトリのチェックアウト元： %s" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "コマンドライン" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "競合" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "ファイル" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "競合" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "起動(&L)..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "マージツール(&M):" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "自動解決" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "競合をマージする(&M)" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "解決済みにする(&R)" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d個の競合が解決済みになりました" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "全ての競合は解決されました。" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "merge ツールの実行中にエラーが発生しました (コード %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "エラー" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "外部マージツールのサポートにはBazaar 2.4以降が必要です" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "qconfig の merge タブで外部のマージプログラムを設定してください" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "外部マージツール %(tool)s は使用できません" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -545,200 +591,201 @@ "tab." msgstr "" "外部マージツールの定義が無効です。: '%(tool)s'\n" -"フラグ '%(flags)s' が指定されていません。qconfigのマージタブで修正してください。" +"フラグ '%(flags)s' が指定されていません。qconfigのマージタブで修正してくださ" +"い。" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "%s フラグがありません。 qconfig の merge タブで設定してください" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "パスの競合" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "内容の競合" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "テキストの競合" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "重複ID" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "複製" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "フォルダ構成のループ" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "親のバージョンが定義されていません" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "親が見つかりません" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "親が削除されています" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "親がディレクトリではありません" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "差異を表示(&D)" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "削除" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "追加" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "名称変更/修正" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "名称変更" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "変更" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "最終更新:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "状態:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "種類:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "プロパティ:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "[バイナリファイル (%d byte)]" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ ファイル終端に改行がない" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "%s の作業ツリー" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "作業ツリー" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "%(branch)sのリビジョン%(rev)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "リビジョン %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "%(branch)sのリビジョンID%(revid)s" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "リビジョンID: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "マージプレビュー" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "削除" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "追加" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "名称変更/修正" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "名称変更" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "変更" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "検索(&F)" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "アクティブなパネル上で検索します" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unified形式で表示" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "サイドバイサイド表示とUnidiff表示を切り替えます" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "更新(&R)" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "外部Diffツール(&E)" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "外部Diffツールを起動します" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "全体表示(&C)" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "タブの幅" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "左側のタブ幅" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "右側のタブ幅" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "左側のエンコード" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "右側のエンコード" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "空白の変更を無視する(&I)" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%dファイル" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -747,12 +794,12 @@ "%s はバージョン管理外です。\n" "処理は中断しました。" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "閉じる(&C)" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "変更が見つかりません。" @@ -840,6 +887,58 @@ msgid "No changes selected to revert" msgstr "revert する変更が選択されていません" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "無視" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "バージョン管理外のファイル" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "バージョン" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "無視" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "操作" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +#, fuzzy +msgid "Case-insensitive pattern" +msgstr "大文字/小文字を区別" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "キャンセル(&C)" + +#: lib\ignore.py:228 +#, fuzzy +msgid "No action selected" +msgstr "変更箇所が選択されていません" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "情報" @@ -894,7 +993,7 @@ msgid "Messages and File text (indexed)" msgstr "メッセージとファイル内のテキスト(索引あり)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "差分を表示(&D)..." @@ -935,7 +1034,8 @@ msgid "" "Are you sure you want to revert this file to the state it was at the " "selected revision?" -msgstr "本当にこのファイルを選択したバージョンの時点の状態に戻してもよろしいですか？" +msgstr "" +"本当にこのファイルを選択したバージョンの時点の状態に戻してもよろしいですか？" #: lib\logmodel.py:43 lib\treewidget.py:354 msgid "Rev" @@ -954,91 +1054,92 @@ msgid "bug #%s" msgstr "バグ #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "ファイルの差分を表示(&d)" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "すべての差分を表示(&d)" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "差分を表示(&d)..." -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "すべての差分を表示(&d)..." -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "ツリーを表示(&T)..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "このリビジョンにタグを付加する(&R)" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "このバージョンに戻す(&e)" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "このリビジョンに更新(&U)" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "チェリーピック(&C)" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "リバースチェリーピック(&v)" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "リビジョン%s (ID:%s)に戻す" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "%sをリビジョン%s (ID:%s)に戻す" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "元に戻す" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "リビジョン%s(リビジョンID：%s)に更新します" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "%sをリビジョン%s(リビジョンID：%s)に更新します" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "リビジョン%s～%s を、%sから%sに取り込みます。" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "チェリーピッキング" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "リビジョン%s～%sの変更を取り消し(リバースチェリーピッキング)します。" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." -msgstr "リビジョン%s～%sの変更を%sで取り消し(リバースチェリーピッキング)します。" +msgstr "" +"リビジョン%s～%sの変更を%sで取り消し(リバースチェリーピッキング)します。" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "リバースチェリーピッキング" @@ -1138,14 +1239,14 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" -msgstr "" -"QBzr — Bazaarのグラフィカルインターフェース
バージョン %(qbzr_version)s (bzrlib " -"%(bzrlib_version)s)

Copyright © 2006-2008 Lukáš Lalinský " -"とその他の方々

http://bazaar-" -"vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +msgstr "" +"QBzr — Bazaarのグラフィカルインターフェース
バージョン " +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský とその他の方々

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1171,7 +1272,7 @@ msgid "Version" msgstr "バージョン" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "説明" @@ -1196,7 +1297,7 @@ msgid "(no description)" msgstr "(説明なし)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "作業ツリーにはコミットしていない変更が含まれています。" @@ -1355,100 +1456,100 @@ msgid "Revisions:" msgstr "リビジョン:" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "シェルフの管理" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "棚に上げる" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "棚上げされた変更の表示" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "再試行(&R)" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "待機中" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "開始..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "”bzr.exe”が見つかりません" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "”bzr”スクリプトが見つかりません" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "中止..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "完了!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "パスワードを入力して下さい" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "ユーザ名を入力してください" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "失敗!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "bzrの実行に失敗しました。" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "bzr実行中にエラーが発生しました。(エラーコード: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "中断しました！" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "切り替え" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "チェックアウトの切り替え" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "チェックアウト(履歴あり):" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "軽量チェックアウト:" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "チェックアウト元のブランチ:" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "切り替え先ブランチ:" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "切り替え前にブランチを作成する" @@ -1561,86 +1662,88 @@ msgid "x-bit" msgstr "実行ビット" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "ファイル名" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "変更なし" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "変更" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "管理外" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "無視" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "開く(&O)" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "ファイルを表示(&V)" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "注釈を表示する(&A)" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "ログを表示(&l)" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "競合を解決済みにする(&R)" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "追加(&A)" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "元に戻す(&R)" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "名前を変更する(&R)" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "移動、変名済みとしてマーク(&M)" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "移動済みとしてマーク(&M)" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "変名済みとしてマーク(&M)" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "本当に選択したファイルの変更を破棄してもよろしいですか？" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "外部マージ" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" -msgstr "削除すると元に戻せなくなるファイルが選択されています。本当に削除してもよろしいですか？" +msgstr "" +"削除すると元に戻せなくなるファイルが選択されています。本当に削除してもよろし" +"いですか？" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "全選択/非選択" @@ -1663,13 +1766,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "参照..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "宛先(&T):" @@ -1794,7 +1890,9 @@ #: lib\ui_new_tree.py:152 msgid "Click a link for more information about checkouts and branches." -msgstr "チェックアウトとブランチに関するより多くの情報を得るにはリックをクリックしてください。" +msgstr "" +"チェックアウトとブランチに関するより多くの情報を得るにはリックをクリックして" +"ください。" #: lib\ui_new_tree.py:159 msgid "Most recent (tip) revision" @@ -2072,184 +2170,187 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "削除" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "変名" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "追加" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "テキストの変更" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "ターゲットの変更" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "バイナリの変更" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "シェルフに登録する際のメッセージを入力してください" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "ハンク" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "すべて" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "前のハンク" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "次のハンク" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "エディタを使用" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "破棄" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "すべて選択" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "すべて選択解除" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "レイアウト(&L)" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "変更エディタは設定されていません" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "%d個のファイルの変更を、シェルフに登録せずに破棄します。" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "%d個のファイルの変更をシェルフに棚上げします。" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "変更箇所が選択されていません" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +#, fuzzy +msgid "Operation aborted because working tree has pending merges." msgstr "作業ツリーがマージ待ち状態なので、処理を中止しました" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "処理対象のファイルが変更されたため、処理を中止しました" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "変更エディタで編集済み\n" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "ID" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "空白を無視する" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "シェルフから戻す" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "シミュレーション" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "保持する" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "削除する" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "ファイル一覧を表示する" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "シェルフ[%(id)d]の変更を適用し、シェルフからは削除します" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" -msgstr "実際には作業ツリーは変更せずに、シェルフ[%(id)d]の変更を適用するシミュレーションを行います。" +msgstr "" +"実際には作業ツリーは変更せずに、シェルフ[%(id)d]の変更を適用するシミュレー" +"ションを行います。" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "シェルフ[%(id)d]の変更を適用しますが、シェルフにも残したままにします。" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "シェルフ[%(id)d]の変更を、適用せずに破棄します。" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "検索: " -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "前へ" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "次へ" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "大文字/小文字を区別" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "単語で検索" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "検索を閉じる" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "レイアウト" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "レイアウト %d" @@ -2311,7 +2412,6 @@ #~ msgid "Left side encoding:" #~ msgstr "左側のエンコード" -#, python-format #~ msgid "%s (Configured external merge definition in qconfig)" #~ msgstr "%s(qconfigで設定された外部マージツール)" @@ -2325,14 +2425,17 @@ #~ "%r is output, %b is .BASE, %t is .THIS and %o is .OTHER file." #~ msgstr "" #~ "qconfigで設定されたマージツール。\n" -#~ "extmergeというプラグインの external_merge = kdiff3 --output %r %b %t %o " -#~ "という設定方法と同じルールに従います。\n" -#~ "%rは出力,%bは .BASE, %t は .THIS, %o は .OTHER ファイルに置き換えられます。" +#~ "extmergeというプラグインの external_merge = kdiff3 --output %r %b %t %o と" +#~ "いう設定方法と同じルールに従います。\n" +#~ "%rは出力,%bは .BASE, %t は .THIS, %o は .OTHER ファイルに置き換えられま" +#~ "す。" #~ msgid "Push branch:" #~ msgstr "プッシュ先ブランチ:" #~ msgid "" -#~ "Some of the files selected cannot be recoverd if removed. Are you sure you " -#~ "want to remove these files?" -#~ msgstr "削除すると元に戻せなくなるファイルがあります。本当にこれらのファイルを削除してもよろしいですか？" +#~ "Some of the files selected cannot be recoverd if removed. Are you sure " +#~ "you want to remove these files?" +#~ msgstr "" +#~ "削除すると元に戻せなくなるファイルがあります。本当にこれらのファイルを削除" +#~ "してもよろしいですか？" diff -Nru qbzr-0.22.1/po/qbzr-nl.po qbzr-0.22.2/po/qbzr-nl.po --- qbzr-0.22.1/po/qbzr-nl.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-nl.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2011-03-13 11:09+0000\n" "Last-Translator: Rachid \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Toon genegeerde bestanden" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Annoteer" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Bezig met laden..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revisie %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Bladeren" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Locatie:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revisie:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Tonen" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -151,21 +152,21 @@ msgid "Encoding:" msgstr "Codering:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Vastleggen" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Branch" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "&Lokale commit" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -173,35 +174,35 @@ "Lokale commits worden niet naar de master branch gepushed totdat een normale " "commit is uitgevoerd" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Beschrijving:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Bericht" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Toon niet-beheerde bestanden" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Voer het commit-bericht in" @@ -231,8 +232,7 @@ "Stel de auteur van deze wijziging in, als die anders is dan de committer" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" "Voer de naam van de auteur in, b.v. John Doe <jdoe@example.com>" @@ -244,9 +244,9 @@ msgid "Pending Merges" msgstr "Nog uit te voeren merges" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Status" @@ -258,10 +258,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -291,9 +291,9 @@ "Er zal een lokale commit op de branch worden uitgevoerd. De master branch " "zal niet worden geüpdate totdat een niet-lokale commit wordt gedaan." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Verschil" @@ -372,7 +372,7 @@ msgstr "Opdracht" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Verwijderen" @@ -392,7 +392,7 @@ msgid "External Diff Apps:" msgstr "Externe Diff Applicaties:" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Naam" @@ -429,15 +429,45 @@ msgid "Spell check &language:" msgstr "Taal voor Spellingscontrole" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Ingebouwde diff" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -449,94 +479,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Conflicten" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Bestand" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Conflict" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "Start..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "Merge tool:" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Automatisch oplossen" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d conflict is automatisch opgelost" msgstr[1] "%d conflicten zijn automatisch opgelost" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Alle conflicten zijn opgelost." -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Fout tijdens het gebruik van de merge tool (code %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Fout" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "Stel een externe merge applicatie in qconfig onder de Merge tab" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -544,200 +578,199 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." -msgstr "" -"De vlag %s ontbreekt. Configureer dit in qconfig onder het tab merge." +msgstr "De vlag %s ontbreekt. Configureer dit in qconfig onder het tab merge." -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "pad conflict" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "conflicterende inhoud" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "conflicterende text" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "dubbel id" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "duplicaat" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "parent loop" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "parent niet onder versiebeheer" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "ontbrekende ouder" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "verwijderen van de ouder" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "niet-folder parent" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Toon verschillen" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "verwijderd" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "toegevoegd" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "hernoemd en gewijzigd" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "hernoemd" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "gewijzigd" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Laatst gewijzigd:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Status:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Soort:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Eigenschappen:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "Geen newline aan einde bestand" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Working tree voor %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Working Tree" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Rev %(rev)s voor %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "Revid: %(revid)s voor %(branch)s" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "Revid: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Merge Preview" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "verwijderd" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "toegevoegd" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "hernoemd en gewijzigd" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "hernoemd" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "gewijzigd" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unidiff" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Verversen" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d bestand" msgstr[1] "%d bestanden" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -746,12 +779,12 @@ "Bestand %s is niet onder versiebeheer.\n" "Operatie afgebroken." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Sluiten" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "Geen wijzigingen gevonden." @@ -839,6 +872,53 @@ msgid "No changes selected to revert" msgstr "Geen wijzigengen geselecteerd om ongedaan te maken" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Niet-beheerde bestanden" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Locatie:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Annuleren" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Info" @@ -893,7 +973,7 @@ msgid "Messages and File text (indexed)" msgstr "Berichten en bestandstekst (geindexeerd)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Toon verschillen..." @@ -951,91 +1031,91 @@ msgid "bug #%s" msgstr "bug #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "Toon bestandsverschillen" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Toon alle verschillen" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "Toon bestandsverschillen..." -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "Toon alle verschillen..." -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Toon boom..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Ongedaan maken" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1135,14 +1215,14 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" "QBzr — Een grafische gebruikersinterface voor Bazaar
Versie " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský en anderen

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský en anderen

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1168,7 +1248,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1193,7 +1273,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "De working tree heeft niet gecommitte wijzigingen" @@ -1355,100 +1435,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Bezig met starten..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Afbreken..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Voltooid!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1555,86 +1635,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1657,13 +1737,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Naar:" @@ -2066,186 +2139,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Voltooid" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" @@ -2276,7 +2349,6 @@ #~ "external_merge = kdiff3 --output %r %b %t %o\n" #~ "%r is de uitvoer, %b is .BASE, %t is .THIS and %o is het .OTHER bestand." -#, python-format #~ msgid "%s (Configured external merge definition in qconfig)" #~ msgstr "%s (Ingestelde externe merge definitie in qconfig)" diff -Nru qbzr-0.22.1/po/qbzr-pl.po qbzr-0.22.2/po/qbzr-pl.po --- qbzr-0.22.1/po/qbzr-pl.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-pl.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2010-10-02 10:55+0000\n" "Last-Translator: Radosław Piliszek \n" "Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,64 +33,64 @@ msgid "Show ignored files" msgstr "Pokaż pliki ignorowane" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Objaśnienie" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Ładowanie..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "Kodowanie" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "Szukaj" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "Przejdź do linii" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "Pokaż opcje" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "Zawijanie wierszy" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Wersja %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "Przejdź do linii: " -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "Przejdź" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "&Zaznacz tę rewizję" @@ -113,13 +114,13 @@ msgid "Bind to:" msgstr "Przypisz do:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Przeglądaj" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Wybierz lokalizację gałęzi." @@ -127,20 +128,20 @@ msgid "Master branch location not specified." msgstr "Położenie głównej gałęzi nie sprezycowane." -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Lokalizacja:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Rewizja:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Pokaż" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filtr" @@ -152,21 +153,21 @@ msgid "Encoding:" msgstr "Kodowanie:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Wyślij" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Gałąź" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "&Lokalne wysłanie" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -174,37 +175,37 @@ "Lokalne zmiany nie są wysyłane do głównej gałęzi dopóki zwykłe wysłanie nie " "jest dokonane." -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Opis:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" "Drzewo robocze jest przedatowane. Aby wykonać commit, zaktualizuj drzewo " "robocze." -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "Aktualizuj" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Wiadomość" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Pokaż niewersjonowane pliki" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Wprowadź opis zmiany" @@ -233,8 +234,7 @@ msgstr "Ustal autora zmiany, jeśli jest inny niż wysyłający" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" "Wprowadź imię autora, np. Jan Kowalski <jkowalski@example.com>" @@ -246,9 +246,9 @@ msgid "Pending Merges" msgstr "Oczekujące scalenia:" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Status" @@ -260,10 +260,10 @@ msgid "You should provide a commit message." msgstr "Musisz wpisać wiadomość commitu." -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -295,9 +295,9 @@ "Lokalna zmiana w gałęzi zostanie dokonana. Główna gałąź nie zostanie " "zaktualizowana dopóki zwykła zmiana nie zostanie dokonana." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Różnice" @@ -376,7 +376,7 @@ msgstr "Polecenie" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Usuń" @@ -390,14 +390,13 @@ #: lib\config.py:179 msgid "Show inter-group inserts and deletes in green and red" -msgstr "" -"Pokazuj wewnętrzne dodania i usunięcia w kolorze zielonym i czerwonym" +msgstr "Pokazuj wewnętrzne dodania i usunięcia w kolorze zielonym i czerwonym" #: lib\config.py:181 msgid "External Diff Apps:" msgstr "Zewnętrzny program diff:" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Nazwa" @@ -434,15 +433,46 @@ msgid "Spell check &language:" msgstr "Sprawdź poprawność pisownii:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Przeglądaj..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +#, fuzzy +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "Ten katalog jest kopią: %s" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Wbudowany program diff" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -454,94 +484,99 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "Wybierz edytor" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "Ten katalog jest kopią: %s" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Konflikty" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Plik" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Konflikt" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "&Launch..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "Narzędzie M&erge:" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Auto-rozwiązywanie" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "Konflikt &Merge" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "Oznacz jako &resolved" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "%d konflikt automatycznie rozwiązany." msgstr[1] "%d konfliktów automatycznie rozwiązanych." -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Wszystkie konflikty rozwiązane" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Błąd podczas działania merge tool (kod %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Błąd" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -549,192 +584,192 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "konflikt ścieżki" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "konflikt zawartości" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "konflikt tekstu" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "podwójne id" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "duplikat" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "brakujący przodek" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "usuwanie przodka" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "przodek poza katalogiem" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Pokaż &differences" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "usunięto" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "dodano" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "przesunięto i zmodyfikowano" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "przesunięto" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "zmodyfikowano" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Ostatnio zmodyfikowany:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Status:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Typ:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Właściwości:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ Brak pustej linii na końcu pliku" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Drzewo dla %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Drzewo" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Rewizja %(rev)s for %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Rewizja %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "ID rewizji: %(revid)s dla %(branch)s" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "ID rewizji: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Podgląd scalania" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "usunięto" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "dodano" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "przesunięto i zmodyfikowano" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "przesunięto" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "zmodyfikowano" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unidiff" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Odśwież" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" @@ -742,7 +777,7 @@ msgstr[1] "%d plik" msgstr[2] "%d plików" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -751,12 +786,12 @@ "Plik %s nie podlega wersjonowaniu.\n" "Operacja przerwana." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Zakończ" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "Brak zmian." @@ -844,6 +879,57 @@ msgid "No changes selected to revert" msgstr "Nie wybrano zmian do przywrócenia" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Ignorowany" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Pliki niewersjonowane" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "Wersja" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Ignorowany" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Czynność" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +#, fuzzy +msgid "Case-insensitive pattern" +msgstr "Rozróżniaj wielkość liter" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Anuluj" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Informacje" @@ -898,7 +984,7 @@ msgid "Messages and File text (indexed)" msgstr "Tekst wiadomości i plików (zindeksowanych)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Pokaż &różnice..." @@ -956,91 +1042,91 @@ msgid "bug #%s" msgstr "błąd #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "Pokaż różnice pliku" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Pokaż wszystkie różnice" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "Pokaż różnice pliku" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "Pokaż wszystkie różnice" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Pokaż drzewo..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "Otaguj rewizję..." -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "Przywróć stan z tej rewizji" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "Zaktualizuj do tej rewizji" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "Przywróć do rewizji %s revid:%s." -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "Przywróć %s do rewizji %s revid:%s." -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Wycofaj" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "Zaktualizuj do rewizji %s revid:%s." -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "Zaktualizuj %s do rewizji %s revid:%s." -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1140,14 +1226,14 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" "Qbzr - Graficzny interfejs dla Bazaar
Wersja " "%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " -"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1173,7 +1259,7 @@ msgid "Version" msgstr "Wersja" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Opis" @@ -1198,7 +1284,7 @@ msgid "(no description)" msgstr "(brak opisu)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "Drzewo robocze posiada niezatwierdzone zmiany." @@ -1359,100 +1445,100 @@ msgid "Revisions:" msgstr "Rewizje" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "&Ponów" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "Gotowy" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Uruchamianie..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Porzucanie..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Zakończono!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Wprowadź hasło" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "Wprowadż Nazwę Użytkownika" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Błąd!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Nie udało się uruchomić bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Błąd w trakcie działania bzr. (error code: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "Przerwane!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "Przełącz" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1565,86 +1651,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "Nazwa pliku" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Niezmieniony" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Zmienione" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "Nie wersjonowane" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Ignorowany" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "&Otwórz" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "Pokaż plik" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "Pokaż &dziennik" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "Oznacz konflikt jako &rozwiązany" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "Dod&aj" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Przywróć" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "Z&mień nazwę" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "&Oznacz jako przesunięte i o zmienionej nazwie" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "&Oznacz jako przesunięte" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Zaznacz / odznacz wszystkie" @@ -1667,13 +1753,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Przeglądaj..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Do:" @@ -2076,186 +2155,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Pełne" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "Znajdź: " -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "Poprzedni" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "Następny" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "Rozróżniaj wielkość liter" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "Całe wyrazy" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" @@ -2318,8 +2397,8 @@ #~ msgstr "Publiczna gałąź:" #~ msgid "" -#~ "Some of the files selected cannot be recoverd if removed. Are you sure you " -#~ "want to remove these files?" +#~ "Some of the files selected cannot be recoverd if removed. Are you sure " +#~ "you want to remove these files?" #~ msgstr "" #~ "Niektóre z tych plików nie mogą być odzyskane po usunięciu. Czy na pewno " #~ "chcesz usunąć te pliki?" diff -Nru qbzr-0.22.1/po/qbzr.pot qbzr-0.22.2/po/qbzr.pot --- qbzr-0.22.1/po/qbzr.pot 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr.pot 2012-04-05 15:26:01.000000000 +0000 @@ -1,18 +1,22 @@ +# 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: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\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" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -"X-Launchpad-Export-Date: 2011-08-16 16:08+0000\n" -"X-Generator: Launchpad (build 13687)\n" #: lib\add.py:45 lib\config.py:139 lib\config.py:160 lib\config.py:191 #: lib\ui_merge_config.py:60 @@ -27,64 +31,64 @@ msgid "Show ignored files" msgstr "" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "" -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -108,13 +112,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -122,20 +126,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -147,55 +151,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -222,8 +226,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" #: lib\commit.py:391 @@ -234,9 +237,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "" @@ -248,10 +251,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "" @@ -277,9 +280,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "" @@ -358,7 +361,7 @@ msgstr "" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "" @@ -378,7 +381,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "" @@ -415,15 +418,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -435,94 +468,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -530,211 +567,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "" msgstr[1] "" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -822,6 +859,50 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +msgid "No action" +msgstr "" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +msgid "Cancelled" +msgstr "" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -876,7 +957,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -934,91 +1015,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1118,9 +1199,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1147,7 +1228,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1172,7 +1253,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1332,100 +1413,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "" -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "" -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1532,86 +1613,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1634,13 +1715,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2043,186 +2117,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-pt_BR.po qbzr-0.22.2/po/qbzr-pt_BR.po --- qbzr-0.22.1/po/qbzr-pt_BR.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-pt_BR.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2009-11-16 21:09+0000\n" "Last-Translator: Fabio S Monteiro \n" "Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Exibir arquivos ignorados" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Anotar" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "" -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Revisão %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Procurar" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Localização:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revisão:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Exibir" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -151,21 +152,21 @@ msgid "Encoding:" msgstr "Codificação" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Commit" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Branch" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -173,35 +174,35 @@ "Commis locais não serão submetidos ao branch superior até que um commit " "normal seja feito." -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Mensagem" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Exibir arquivos não-versionados" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Digite a mensagem de commit" @@ -231,8 +232,7 @@ "Determina o autor desta alteração, caso seja diferente de quem faz o commit" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "O nome do autor, ex: João da Silva <jsilva@exemplo.com>" #: lib\commit.py:391 @@ -243,9 +243,9 @@ msgid "Pending Merges" msgstr "Merges Pendentes" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Estado" @@ -257,10 +257,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -286,9 +286,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Diff" @@ -367,7 +367,7 @@ msgstr "Comando" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Remover" @@ -387,7 +387,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Nome" @@ -424,15 +424,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -444,94 +474,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Arquivo" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -539,211 +573,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "removido" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "adicionado" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "renomeado e modificado" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "renomeado" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "modificado" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Última modificação:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Estado:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Tipo:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Propriedades:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ Nenhuma linha no fim do arquivo" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "removido" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "adicionado" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "renomeado e modificado" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "renomeado" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "modificado" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Diff unificado" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Atualizar" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d arquivo" msgstr[1] "%d arquivos" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Fechar" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -831,6 +865,52 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Localização:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Cancelar" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -885,7 +965,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -943,91 +1023,91 @@ msgid "bug #%s" msgstr "bug #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Reverter" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1127,9 +1207,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1156,7 +1236,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1181,7 +1261,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1341,100 +1421,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Iniciando..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Abortando..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Terminado!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Falhou!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Falhou ao iniciar o bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Error ao executar o bzr. (código de erro: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1541,86 +1621,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1643,13 +1723,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Para:" @@ -2052,186 +2125,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-ru.po qbzr-0.22.2/po/qbzr-ru.po --- qbzr-0.22.1/po/qbzr-ru.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-ru.po 2012-04-05 15:26:01.000000000 +0000 @@ -5,15 +5,16 @@ msgstr "" "Project-Id-Version: QBzr 0.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2010-06-11 08:30+0000\n" "Last-Translator: Alex L. \n" "Language-Team: Russian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Launchpad-Export-Date: 2011-08-16 16:08+0000\n" "X-Generator: Launchpad (build 13687)\n" @@ -30,64 +31,64 @@ msgid "Show ignored files" msgstr "Показать игнорируемые файлы" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Аннотация" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Загрузка..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "Ревизия %s" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "Аннотация для этой ревизии" @@ -111,13 +112,13 @@ msgid "Bind to:" msgstr "Привязать к:" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Обзор" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "Выбрать расположение ветки" @@ -125,20 +126,20 @@ msgid "Master branch location not specified." msgstr "Не указано расположение основной ветви" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Расположение:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Версия:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Показать" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Фильтр" @@ -150,21 +151,21 @@ msgid "Encoding:" msgstr "Кодировка:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Зафиксировать" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Ветка" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "Локальная фиксация" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" @@ -172,35 +173,35 @@ "Локальные фиксации не передаются в главную ветку до тех пор, пока не будет " "сделана обычная фиксация." -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Описание:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Комментарий" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Показать неизвестные файлы" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Введите комментарий к этой версии" @@ -231,10 +232,8 @@ "фиксацию версии" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" -msgstr "" -"Введите имя автора, например: John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgstr "Введите имя автора, например: John Doe <jdoe@example.com>" #: lib\commit.py:391 msgid "Changes" @@ -244,9 +243,9 @@ msgid "Pending Merges" msgstr "Незаконченное объединение" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Состояние" @@ -258,10 +257,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&ОК" @@ -293,9 +292,9 @@ "Фиксация будет выполнена только в локальной ветке. Главная ветка не будет " "обновлена до тех пор, пока вы не сделаете обычную (не локальную) фиксацию." -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Различия" @@ -374,7 +373,7 @@ msgstr "Команда" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Удалить" @@ -394,7 +393,7 @@ msgid "External Diff Apps:" msgstr "Программы просмотра изменений:" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Имя" @@ -431,15 +430,46 @@ msgid "Spell check &language:" msgstr "Проверка орфографии:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Обзор..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +#, fuzzy +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "Это рабочая копия ветки: %s" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "Встроенный просмотрщик" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -451,60 +481,65 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "Выберите программу-редактор" -#: lib\config.py:914 +#: lib\config.py:726 +#, fuzzy +msgid "Select base directory for checkouts" +msgstr "Это рабочая копия ветки: %s" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "Конфликты" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Файл" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "Конфликт" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "Запустить..." -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "Программа для объединения изменений:" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "Автоматически" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "&Объединить конфликты" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "Снять пометку о конфликте" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." @@ -512,34 +547,34 @@ msgstr[1] "Автоматически решены %d конфликта." msgstr[2] "Автоматически решены %d конфликтов." -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "Все конфликты автоматически решены." -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "Ошибка при попытке запуска программы (код %d)" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "Ошибка" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -547,192 +582,192 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "Отсутствие флага: %s. Настроить в qconfig на вкладке слияния." -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "конфликт путей" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "конфликт содержания" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "текстовый конфликт" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "совпадающий id" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "дубликат" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "цикл родителя" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "отсутствует родительский каталог" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "удаление родителя" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "не каталогизированный родитель" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "Показать различия" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "удален" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "добавлен" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "переименован и изменен" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "переименован" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "изменён" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Последние изменения:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Состояние:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Тип:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Свойства:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ Нет символа перевода строки в конце файла" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Рабочая копия ветки %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Рабочая копия" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Версия %(rev)s в ветке %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Версия %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "Revid: %(revid)s для %(branch)s" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "Revid: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Результат объединения" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "удален" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "добавлен" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "переименован и изменен" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "переименован" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "изменён" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unidiff" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Обновить" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" @@ -740,7 +775,7 @@ msgstr[1] "%d файла" msgstr[2] "%d файлов" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" @@ -749,12 +784,12 @@ "Изменения в файле \"%s\" не отслеживаются.\n" "Операция прервана." -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Закрыть" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "Изменения не найдены." @@ -842,6 +877,56 @@ msgid "No changes selected to revert" msgstr "Нет файлов для операции возврата к предыдущей версии" +#: lib\ignore.py:37 lib\ignore.py:113 +#, fuzzy +msgid "Ignore" +msgstr "Игнорируется" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Неверсифицированные файлы" + +#: lib\ignore.py:58 +#, fuzzy +msgid "Extension" +msgstr "Версия" + +#: lib\ignore.py:59 +#, fuzzy +msgid "Ignore as" +msgstr "Игнорируется" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Действие" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Отмена" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Сведения" @@ -896,7 +981,7 @@ msgid "Messages and File text (indexed)" msgstr "Сообщения и текстовые файлы (проиндексированные)" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Показать &различия..." @@ -954,91 +1039,91 @@ msgid "bug #%s" msgstr "bug #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "Показать различия для файла" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "Показать различия для всех файлов" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "Показать различия для файла..." -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "Показать различия для всех файлов..." -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Дерево файлов" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "Добавить тег..." -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Возврат к предыдущей версии" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1138,15 +1223,14 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" "QBzr — Графический пользовательский интерфейс для программы " -"Bazaar
Версия %(qbzr_version)s (bzrlib " -"%(bzrlib_version)s)

Copyright © 2006-2008 Lukáš Lalinský и " -"другие

http://bazaar-" -"vcs.org/QBzr" +"Bazaar
Версия %(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-2008 Lukáš Lalinský и другие

http://bazaar-vcs.org/QBzr" #: lib\main.py:472 msgid "Add Bookmark" @@ -1172,7 +1256,7 @@ msgid "Version" msgstr "Версия" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Описание" @@ -1197,7 +1281,7 @@ msgid "(no description)" msgstr "(нет описания)" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "Рабочие файлы содержат незафиксированные изменения." @@ -1306,7 +1390,7 @@ #: lib\run.py:167 msgid "Help for command" -msgstr "Помощь по комманде" +msgstr "Справка для выбранной команды" #: lib\run.py:284 msgid "Select path to insert" @@ -1364,100 +1448,100 @@ msgid "Revisions:" msgstr "Ревизии:" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "&Повторить" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "Готов" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Начинаем операцию..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Останавливаем операцию..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Завершено!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "Введите пароль" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "Введите имя пользователя" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Неудачно!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "Не могу запустить bzr." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "Ошибка во время работы bzr. (код ошибки: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "Прервано!" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "Переключить" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "Переключить рабочую копию" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "Тяжеловесная рабочая копия:" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "Легковесная рабочая копия:" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "Рабочая копия для ветки:" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "Переключить на ветку:" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "Создать ветку перед переключением" @@ -1570,87 +1654,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "Имя файла" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "Не изменен" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "Изменен" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "Не версионирован" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "Игнорируется" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "&Открыть" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "&Просмотр файла" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "Показать &аннотацию" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "Показать &журнал" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "Снять пометку о конфликте" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "&Добавить" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "&Отменить изменения" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "Переименовать" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "Пометить как перемещенный и переименованный" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "Пометить как перемещенный" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "Пометить как переименованный" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" -msgstr "" -"Вы действительно хотите вернуть выбранные файлы в исходное состояние?" +msgstr "Вы действительно хотите вернуть выбранные файлы в исходное состояние?" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "Внешние слияния" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Выбрать все файлы" @@ -1673,13 +1756,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Обзор..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Куда:" @@ -2088,186 +2164,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Показывать файлы целиком" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" @@ -2330,8 +2406,8 @@ #~ msgstr "Опубликовать ветвь:" #~ msgid "" -#~ "Some of the files selected cannot be recoverd if removed. Are you sure you " -#~ "want to remove these files?" +#~ "Some of the files selected cannot be recoverd if removed. Are you sure " +#~ "you want to remove these files?" #~ msgstr "" #~ "Некоторые из выбранных файлов не могут быть восстановлены, если будут " #~ "удалены. Вы уверены, что хотите удалить эти файлы?" diff -Nru qbzr-0.22.1/po/qbzr-sk.po qbzr-0.22.2/po/qbzr-sk.po --- qbzr-0.22.1/po/qbzr-sk.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-sk.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: sk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2008-11-22 15:14+0000\n" "Last-Translator: Lukáš Lalinský \n" "Language-Team: Slovak \n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -30,64 +31,64 @@ msgid "Show ignored files" msgstr "" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Anotovať" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "" -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -111,13 +112,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Prehliadať" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -125,20 +126,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Umiestnenie:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revízia:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Zobraziť" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -150,55 +151,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Odovzdať" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Správa" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Zobraziť neverzované súbory" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Vložte správu" @@ -228,8 +229,7 @@ "Nastaví meno autora tejto zmeny, v prípade že je odlišné od odovzdávateľa." #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" "Vložte meno autora, napr. Ján Mrkvička <jmrkvicka@example.com>" @@ -241,9 +241,9 @@ msgid "Pending Merges" msgstr "Čakajúce zlúčenia" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Stav" @@ -255,10 +255,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -284,9 +284,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Rozdiely" @@ -365,7 +365,7 @@ msgstr "Príkaz" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Odstrániť" @@ -385,7 +385,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Názov" @@ -422,15 +422,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -442,94 +472,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Súbor" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -537,192 +571,192 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "vymazané" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "pridané" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "premenované a zmeneé" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "premenované" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "zmenené" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Naposledy zmenené:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Stav:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Typ:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "vymazané" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "pridané" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "premenované a zmeneé" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "premenované" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "zmenené" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unifikované" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" @@ -730,19 +764,19 @@ msgstr[1] "%d súbor" msgstr[2] "%d súbory" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Zavrieť" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -830,6 +864,52 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Umiestnenie:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Zrušiť" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -884,7 +964,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -942,91 +1022,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1126,9 +1206,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1155,7 +1235,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1180,7 +1260,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1340,100 +1420,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "" -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "" -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1540,86 +1620,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1642,13 +1722,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2051,186 +2124,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-sl.po qbzr-0.22.2/po/qbzr-sl.po --- qbzr-0.22.1/po/qbzr-sl.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-sl.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,16 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2008-11-22 14:11+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Slovenian \n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || " -"n%100==4 ? 3 : 0);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" "X-Launchpad-Export-Date: 2011-08-16 16:08+0000\n" "X-Generator: Launchpad (build 13687)\n" @@ -32,64 +33,64 @@ msgid "Show ignored files" msgstr "" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "" -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -113,13 +114,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -127,20 +128,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -152,55 +153,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -227,8 +228,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" #: lib\commit.py:391 @@ -239,9 +239,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "" @@ -253,10 +253,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "" @@ -282,9 +282,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "" @@ -363,7 +363,7 @@ msgstr "" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "" @@ -383,7 +383,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "" @@ -420,15 +420,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -440,94 +470,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -535,211 +569,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "" msgstr[1] "" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -827,6 +861,50 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +msgid "No action" +msgstr "" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +msgid "Cancelled" +msgstr "" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -881,7 +959,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -939,91 +1017,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1123,9 +1201,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1152,7 +1230,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1177,7 +1255,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1337,100 +1415,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "" -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "" -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1537,86 +1615,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1639,13 +1717,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2048,186 +2119,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-sr.po qbzr-0.22.2/po/qbzr-sr.po --- qbzr-0.22.1/po/qbzr-sr.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-sr.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,16 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2009-12-11 18:52+0000\n" "Last-Translator: Данило Шеган \n" "Language-Team: Serbian \n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Launchpad-Export-Date: 2011-08-16 16:08+0000\n" "X-Generator: Launchpad (build 13687)\n" @@ -32,64 +33,64 @@ msgid "Show ignored files" msgstr "" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "" -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -113,13 +114,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -127,20 +128,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -152,55 +153,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -227,8 +228,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" #: lib\commit.py:391 @@ -239,9 +239,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "" @@ -253,10 +253,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "" @@ -282,9 +282,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "" @@ -363,7 +363,7 @@ msgstr "" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "" @@ -383,7 +383,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "" @@ -420,15 +420,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -440,94 +470,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -535,211 +569,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "" msgstr[1] "" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -827,6 +861,50 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +msgid "No action" +msgstr "" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +msgid "Cancelled" +msgstr "" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -881,7 +959,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -939,91 +1017,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1123,9 +1201,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1152,7 +1230,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1177,7 +1255,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1337,100 +1415,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "" -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "" -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1537,86 +1615,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1639,13 +1717,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2048,186 +2119,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-sv.po qbzr-0.22.2/po/qbzr-sv.po --- qbzr-0.22.1/po/qbzr-sv.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-sv.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2011-07-25 22:47+0000\n" "Last-Translator: Johan Helin \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Anteckning" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Laddar..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Bläddra" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Plats:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Revision:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Visa" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "&Filter" @@ -151,55 +152,55 @@ msgid "Encoding:" msgstr "Teckenkodning:" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Verkställ" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Gren" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Beskrivning:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Meddelande" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -226,8 +227,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" #: lib\commit.py:391 @@ -238,9 +238,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Status" @@ -252,10 +252,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -281,9 +281,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Diff" @@ -362,7 +362,7 @@ msgstr "Kommando" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Ta bort" @@ -382,7 +382,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Namn" @@ -419,15 +419,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -439,94 +469,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Fil" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -534,211 +568,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "borttagen" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "tillagd" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "omdöpt och ändrad" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "omdöpt" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "ändrad" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Senast ändrad:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Status:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Sort:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Egenskaper:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "borttagen" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "tillagd" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "omdöpt och ändrad" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "omdöpt" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "ändrad" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Uppdatera" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "%d fil" msgstr[1] "%d filer" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Stäng" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -826,6 +860,52 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Plats:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Avbryt" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -880,7 +960,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -938,91 +1018,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Återgå" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1122,9 +1202,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1151,7 +1231,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1176,7 +1256,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1336,100 +1416,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Startar..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Avbryter..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Färdig!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1536,86 +1616,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1638,13 +1718,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Till:" @@ -2047,186 +2120,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-th.po qbzr-0.22.2/po/qbzr-th.po --- qbzr-0.22.1/po/qbzr-th.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-th.po 2012-04-05 15:26:01.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: qbzr\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2010-03-12 20:23+0000\n" "Last-Translator: Jeroen T. Vermeulen \n" "Language-Team: Thai \n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "กำลังโหลด..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "แสดง" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -151,55 +152,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "คำบรรยาย:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -226,8 +227,7 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" #: lib\commit.py:391 @@ -238,9 +238,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "" @@ -252,10 +252,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "" @@ -281,9 +281,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "" @@ -362,7 +362,7 @@ msgstr "คำสั่ง" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "" @@ -382,7 +382,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "ชื่อ" @@ -419,15 +419,45 @@ msgid "Spell check &language:" msgstr "" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -439,94 +469,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -534,211 +568,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "" msgstr[1] "" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -826,6 +860,50 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +msgid "No action" +msgstr "" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +msgid "Cancelled" +msgstr "" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "" @@ -880,7 +958,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "" @@ -938,91 +1016,91 @@ msgid "bug #%s" msgstr "" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1122,9 +1200,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1151,7 +1229,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1176,7 +1254,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1336,100 +1414,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "" -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "" -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1536,86 +1614,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1638,13 +1716,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2047,186 +2118,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-tr.po qbzr-0.22.2/po/qbzr-tr.po --- qbzr-0.22.1/po/qbzr-tr.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-tr.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2009-07-04 09:57+0000\n" "Last-Translator: Mert Dirik \n" "Language-Team: Turkish \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,64 +32,64 @@ msgid "Show ignored files" msgstr "Yok sayılan dosyaları göster" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Açımla (Annotate)" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "Yükleniyor..." -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -112,13 +113,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Gözat" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -126,20 +127,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Konum:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Düzeltme:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Göster" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -151,55 +152,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Açıklama:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "İleti" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Sürüm denetimi altında olmayan (sürümlendirilmemiş) dosyaları göster" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "" @@ -226,11 +227,10 @@ msgstr "" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" -"Yazarın adını girin, ör. Sarı Çizmeli Mehmet Ağa " -"<cizmeh@ornek.com>" +"Yazarın adını girin, ör. Sarı Çizmeli Mehmet Ağa <cizmeh@ornek.com>" +"" #: lib\commit.py:391 msgid "Changes" @@ -240,9 +240,9 @@ msgid "Pending Merges" msgstr "Bekleyen Birleştirmeler" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Durum" @@ -254,10 +254,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&Tamam" @@ -283,9 +283,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Fark" @@ -364,7 +364,7 @@ msgstr "Komut" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Sil" @@ -384,7 +384,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Ad" @@ -421,15 +421,45 @@ msgid "Spell check &language:" msgstr "Yazım denetimi &dili:" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "Gözat..." + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -441,94 +471,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Dosya" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -536,211 +570,211 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "silindi" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "eklendi" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "adı ve içeriği değiştirildi" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "adı değiştirildi" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "değiştirildi" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Son değiştirilme:" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Durum:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Tür:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Özellikler:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ Dosyanın sonunda yeni satır yok" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Çalışma Ağacı" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Düz %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "silindi" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "eklendi" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "adı ve içeriği değiştirildi" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "adı değiştirildi" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "değiştirildi" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Birleşmiş Fark (Unidiff)" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Tazele" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" msgstr[0] "" msgstr[1] "" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Kapat" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -828,6 +862,53 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +#, fuzzy +msgid "Unknown Files" +msgstr "Sürümlendirilmemiş Dosyalar" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Konum:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&İptal" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Bilgi" @@ -882,7 +963,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "&Farkları göster..." @@ -940,91 +1021,91 @@ msgid "bug #%s" msgstr "hata no. %s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "&Ağacı göster..." -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Eski Durumuna Getir" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1124,9 +1205,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1153,7 +1234,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "" @@ -1178,7 +1259,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1338,100 +1419,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Başlatılıyor..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "İptal ediliyor..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "Tamamlandı!" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "Başarısız Oldu!" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "bzr başlatılamadı." -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "bzr çalıştırılırken bir sorunla karşılaşıldı. (hata kodu: %d)" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1538,86 +1619,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "Tümünü seç / Hiçbirini seçme" @@ -1640,13 +1721,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "Gözat..." - #: lib\ui_branch.py:103 msgid "&To:" msgstr "" @@ -2049,186 +2123,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Tamamı" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/po/qbzr-uk.po qbzr-0.22.2/po/qbzr-uk.po --- qbzr-0.22.1/po/qbzr-uk.po 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/po/qbzr-uk.po 2012-04-05 15:26:01.000000000 +0000 @@ -7,15 +7,16 @@ msgstr "" "Project-Id-Version: qbzr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-03 08:37+0300\n" +"POT-Creation-Date: 2012-02-22 19:25+0900\n" "PO-Revision-Date: 2008-11-22 15:38+0000\n" "Last-Translator: Alexander Belchenko \n" "Language-Team: Ukrainian \n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Launchpad-Export-Date: 2011-08-16 16:08+0000\n" "X-Generator: Launchpad (build 13687)\n" @@ -32,64 +33,64 @@ msgid "Show ignored files" msgstr "Показати ігноровані файли" -#: lib\annotate.py:241 lib\annotate.py:352 lib\annotate.py:421 -#: lib\annotate.py:425 lib\log.py:570 +#: lib\annotate.py:271 lib\annotate.py:387 lib\annotate.py:457 +#: lib\annotate.py:461 lib\log.py:570 msgid "Annotate" msgstr "Анотація" -#: lib\annotate.py:241 lib\diffwindow.py:297 lib\util.py:476 +#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476 msgid "Loading..." msgstr "" -#: lib\annotate.py:301 lib/widgets\shelve.py:306 lib/widgets\shelvelist.py:124 +#: lib\annotate.py:336 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:125 msgid "Encoding" msgstr "" -#: lib\annotate.py:323 lib/widgets\shelve.py:290 lib/widgets\shelvelist.py:105 +#: lib\annotate.py:358 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:106 #: lib/widgets\toolbars.py:63 msgid "Find" msgstr "" -#: lib\annotate.py:327 lib\annotate.py:661 +#: lib\annotate.py:362 lib\annotate.py:704 msgid "Goto Line" msgstr "" -#: lib\annotate.py:331 lib\diffwindow.py:433 lib/widgets\shelve.py:310 -#: lib/widgets\shelvelist.py:128 +#: lib\annotate.py:366 lib\diffwindow.py:261 lib/widgets\shelve.py:320 +#: lib/widgets\shelvelist.py:129 msgid "&View Options" msgstr "" -#: lib\annotate.py:332 lib\diffwindow.py:434 lib/widgets\shelve.py:294 -#: lib/widgets\shelvelist.py:111 +#: lib\annotate.py:367 lib\diffwindow.py:262 lib/widgets\shelve.py:304 +#: lib/widgets\shelvelist.py:112 msgid "View Options" msgstr "" -#: lib\annotate.py:335 +#: lib\annotate.py:370 msgid "Word Wrap" msgstr "" -#: lib\annotate.py:345 +#: lib\annotate.py:380 msgid "Tab Width" msgstr "" -#: lib\annotate.py:422 +#: lib\annotate.py:458 #, python-format msgid "Revision %s" msgstr "" -#: lib\annotate.py:669 +#: lib\annotate.py:712 msgid "Goto Line: " msgstr "" -#: lib\annotate.py:677 +#: lib\annotate.py:720 msgid "Go" msgstr "" -#: lib\annotate.py:689 +#: lib\annotate.py:732 msgid "Close Goto Line" msgstr "" -#: lib\annotate.py:724 +#: lib\annotate.py:767 msgid "&Annotate this revision" msgstr "" @@ -113,13 +114,13 @@ msgid "Bind to:" msgstr "" -#: lib\bind.py:68 lib\browse.py:66 lib\browse.py:237 lib\export.py:182 +#: lib\bind.py:68 lib\browse.py:65 lib\browse.py:236 lib\export.py:182 #: lib\export.py:200 lib\send.py:62 lib\send.py:86 lib\send.py:152 -#: lib\switch.py:99 +#: lib\switch.py:100 msgid "Browse" msgstr "Огляд" -#: lib\bind.py:109 lib\switch.py:157 lib\tag.py:190 +#: lib\bind.py:109 lib\switch.py:158 lib\tag.py:190 msgid "Select branch location" msgstr "" @@ -127,20 +128,20 @@ msgid "Master branch location not specified." msgstr "" -#: lib\browse.py:75 lib\export.py:179 lib\ui_info.py:86 +#: lib\browse.py:74 lib\export.py:179 lib\ui_info.py:86 msgid "Location:" msgstr "Місцезнаходження:" -#: lib\browse.py:80 lib\export.py:216 lib\revisionmessagebrowser.py:160 +#: lib\browse.py:79 lib\export.py:216 lib\revisionmessagebrowser.py:160 #: lib\ui_new_tree.py:160 msgid "Revision:" msgstr "Версія:" -#: lib\browse.py:85 +#: lib\browse.py:84 msgid "Show" msgstr "Показати" -#: lib\browse.py:91 lib\treewidget.py:1293 +#: lib\browse.py:90 lib\treewidget.py:1300 msgid "&Filter" msgstr "" @@ -152,55 +153,55 @@ msgid "Encoding:" msgstr "" -#: lib\commit.py:223 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 -#: lib\subprocess.py:180 +#: lib\commit.py:221 lib\commit.py:637 lib\commit.py:665 lib\commit.py:673 +#: lib\subprocess.py:181 msgid "Commit" msgstr "Фіксувати" -#: lib\commit.py:249 lib\ui_branch.py:99 lib\ui_new_tree.py:130 +#: lib\commit.py:247 lib\ui_branch.py:99 lib\ui_new_tree.py:130 #: lib\ui_tag.py:89 msgid "Branch" msgstr "Гілка" -#: lib\commit.py:261 +#: lib\commit.py:259 msgid "&Local commit" msgstr "Локальна фіксація" -#: lib\commit.py:263 +#: lib\commit.py:261 msgid "" "Local commits are not pushed to the master branch until a normal commit is " "performed" msgstr "" -#: lib\commit.py:267 +#: lib\commit.py:265 msgid "Description:" msgstr "Опис:" -#: lib\commit.py:282 +#: lib\commit.py:280 msgid "" "Local branch is out of date with master branch.\n" "To commit to master branch, update the local branch.\n" "You can also pass select local to commit to continue working disconnected." msgstr "" -#: lib\commit.py:286 +#: lib\commit.py:284 msgid "Working tree is out of date. To commit, update the working tree." msgstr "" -#: lib\commit.py:300 lib\logwidget.py:471 +#: lib\commit.py:298 lib\logwidget.py:475 msgid "Update" msgstr "" -#: lib\commit.py:311 lib\logmodel.py:44 lib\treewidget.py:355 -#: lib/widgets\shelve.py:254 lib/widgets\shelvelist.py:83 +#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355 +#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:84 msgid "Message" msgstr "Коментар" -#: lib\commit.py:319 +#: lib\commit.py:317 msgid "Show non-versioned files" msgstr "Показати невідомі файли" -#: lib\commit.py:346 +#: lib\commit.py:344 msgid "Enter the commit message" msgstr "Надайте коментар до цієї версії" @@ -232,8 +233,7 @@ "робить фіксацію версії" #: lib\commit.py:376 -msgid "" -"Enter the author's name, e.g. John Doe <jdoe@example.com>" +msgid "Enter the author's name, e.g. John Doe <jdoe@example.com>" msgstr "" "Вкажіть ім'я автора, наприклад: John Doe <jdoe@example.com>" @@ -245,9 +245,9 @@ msgid "Pending Merges" msgstr "" -#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:194 -#: lib\treewidget.py:357 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195 +#: lib\treewidget.py:357 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "Status" msgstr "Статус" @@ -259,10 +259,10 @@ msgid "You should provide a commit message." msgstr "" -#: lib\commit.py:639 lib\conflicts.py:186 lib\conflicts.py:191 -#: lib\diffwindow.py:657 lib\util.py:69 lib/widgets\shelve.py:611 -#: lib/widgets\shelve.py:655 lib/widgets\shelve.py:701 -#: lib/widgets\shelve.py:705 +#: lib\commit.py:639 lib\conflicts.py:189 lib\conflicts.py:194 +#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:623 +#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:714 +#: lib/widgets\shelve.py:718 msgid "&OK" msgstr "&OK" @@ -288,9 +288,9 @@ "be updated until a non-local commit is made." msgstr "" -#: lib\commit.py:786 lib\diff.py:103 lib\diffwindow.py:297 -#: lib\diffwindow.py:350 lib\diffwindow.py:564 lib\diffwindow.py:647 -#: lib\diffwindow.py:655 lib\revert.py:291 +#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122 +#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476 +#: lib\diffwindow.py:484 lib\revert.py:291 msgid "Diff" msgstr "Різниця" @@ -369,7 +369,7 @@ msgstr "Команда" #: lib\config.py:142 lib\config.py:163 lib\config.py:194 -#: lib\treewidget.py:1716 lib\treewidget.py:2059 lib\ui_merge_config.py:61 +#: lib\treewidget.py:1723 lib\treewidget.py:2066 lib\ui_merge_config.py:61 msgid "Remove" msgstr "Видалити" @@ -389,7 +389,7 @@ msgid "External Diff Apps:" msgstr "" -#: lib\config.py:184 lib\config.py:911 lib\main.py:353 lib\plugins.py:56 +#: lib\config.py:184 lib\config.py:971 lib\main.py:353 lib\plugins.py:56 #: lib\plugins.py:61 msgid "Name" msgstr "Ім’я" @@ -426,15 +426,45 @@ msgid "Spell check &language:" msgstr "Мова для перевірки орфографії" -#: lib\config.py:374 lib\diff.py:34 +#: lib\config.py:278 +msgid "" +"This directory will be automatically filled in your branch source input field" +msgstr "" + +#: lib\config.py:279 lib\config.py:293 lib\ui_branch.py:102 +#: lib\ui_branch.py:104 lib\ui_init.py:120 lib\ui_merge.py:65 +#: lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 lib\ui_pull.py:63 +#: lib\ui_push.py:65 lib\ui_update_branch.py:85 lib\ui_update_checkout.py:79 +msgid "Browse..." +msgstr "" + +#: lib\config.py:286 +msgid "" +"Base directory\n" +"for &branch sources:" +msgstr "" + +#: lib\config.py:292 +msgid "" +"This directory will be automatically filled in your checkout destination " +"input field" +msgstr "" + +#: lib\config.py:300 +msgid "" +"Base directory\n" +"for &checkouts:" +msgstr "" + +#: lib\config.py:412 lib\diff.py:45 msgid "Builtin Diff" msgstr "" -#: lib\config.py:404 +#: lib\config.py:442 msgid "Import old external merge tool" msgstr "" -#: lib\config.py:405 +#: lib\config.py:443 #, python-format msgid "" "Would you like to import your previously configured external merge tool:\n" @@ -446,94 +476,98 @@ " %(new_cmdline)s" msgstr "" -#: lib\config.py:408 -msgid "old_cmdline" -msgstr "" - -#: lib\config.py:562 +#: lib\config.py:608 msgid "&Ignore and proceed" msgstr "" -#: lib\config.py:563 +#: lib\config.py:609 msgid "&Change the values" msgstr "" -#: lib\config.py:673 +#: lib\config.py:719 msgid "Select editor executable" msgstr "" -#: lib\config.py:914 +#: lib\config.py:726 +msgid "Select base directory for checkouts" +msgstr "" + +#: lib\config.py:733 +msgid "Select default directory for branch sources" +msgstr "" + +#: lib\config.py:974 msgid "Command Line" msgstr "" -#: lib\conflicts.py:49 lib\conflicts.py:165 lib\conflicts.py:182 -#: lib\conflicts.py:189 +#: lib\conflicts.py:50 lib\conflicts.py:166 lib\conflicts.py:185 +#: lib\conflicts.py:192 msgid "Conflicts" msgstr "" -#: lib\conflicts.py:60 +#: lib\conflicts.py:61 lib\ignore.py:57 msgid "File" msgstr "Файл" -#: lib\conflicts.py:61 +#: lib\conflicts.py:62 msgid "Conflict" msgstr "" -#: lib\conflicts.py:93 +#: lib\conflicts.py:94 msgid "&Launch..." msgstr "" -#: lib\conflicts.py:99 +#: lib\conflicts.py:100 msgid "M&erge tool:" msgstr "" -#: lib\conflicts.py:115 +#: lib\conflicts.py:116 msgid "Auto-resolve" msgstr "" -#: lib\conflicts.py:147 lib\treewidget.py:1699 +#: lib\conflicts.py:148 lib\treewidget.py:1706 msgid "&Merge conflict" msgstr "" -#: lib\conflicts.py:153 +#: lib\conflicts.py:154 msgid "Mark as &resolved" msgstr "" -#: lib\conflicts.py:183 +#: lib\conflicts.py:186 #, python-format msgid "%d conflict auto-resolved." msgid_plural "%d conflicts auto-resolved." msgstr[0] "" msgstr[1] "" -#: lib\conflicts.py:190 +#: lib\conflicts.py:193 msgid "All conflicts resolved." msgstr "" -#: lib\conflicts.py:225 +#: lib\conflicts.py:228 #, python-format msgid "Error while running merge tool (code %d)" msgstr "" -#: lib\conflicts.py:226 lib\conflicts.py:279 lib\tag.py:204 lib\trace.py:177 +#: lib\conflicts.py:229 lib\conflicts.py:282 lib\tag.py:204 lib\trace.py:177 #: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985 msgid "Error" msgstr "" -#: lib\conflicts.py:246 +#: lib\conflicts.py:249 msgid "Bazaar 2.4 or later is required for external mergetools support" msgstr "" -#: lib\conflicts.py:256 +#: lib\conflicts.py:259 msgid "Set up external_merge app in qconfig under the Merge tab" msgstr "" -#: lib\conflicts.py:260 +#: lib\conflicts.py:263 #, python-format msgid "External merge tool %(tool)s is not available" msgstr "" -#: lib\conflicts.py:280 +#: lib\conflicts.py:283 #, python-format msgid "" "The extmerge definition: '%(tool)s' is invalid.\n" @@ -541,192 +575,192 @@ "tab." msgstr "" -#: lib\conflicts.py:286 +#: lib\conflicts.py:289 #, python-format msgid "Missing the flag: %s. Configure in qconfig under the merge tab." msgstr "" -#: lib\conflicts.py:291 +#: lib\conflicts.py:294 msgid "path conflict" msgstr "" -#: lib\conflicts.py:292 +#: lib\conflicts.py:295 msgid "contents conflict" msgstr "" -#: lib\conflicts.py:293 +#: lib\conflicts.py:296 msgid "text conflict" msgstr "" -#: lib\conflicts.py:294 +#: lib\conflicts.py:297 msgid "duplicate id" msgstr "" -#: lib\conflicts.py:295 +#: lib\conflicts.py:298 msgid "duplicate" msgstr "" -#: lib\conflicts.py:296 +#: lib\conflicts.py:299 msgid "parent loop" msgstr "" -#: lib\conflicts.py:297 +#: lib\conflicts.py:300 msgid "unversioned parent" msgstr "" -#: lib\conflicts.py:298 +#: lib\conflicts.py:301 msgid "missing parent" msgstr "" -#: lib\conflicts.py:299 +#: lib\conflicts.py:302 msgid "deleting parent" msgstr "" -#: lib\conflicts.py:300 +#: lib\conflicts.py:303 msgid "non-directory parent" msgstr "" -#: lib\diff.py:79 lib\treewidget.py:1694 +#: lib\diff.py:90 lib\treewidget.py:1701 msgid "Show &differences" msgstr "" -#: lib\diffview.py:419 +#: lib\diff.py:199 lib\treewidget.py:331 +msgid "removed" +msgstr "видалений" + +#: lib\diff.py:201 lib\treewidget.py:329 +msgid "added" +msgstr "доданий" + +#: lib\diff.py:203 +msgid "renamed and modified" +msgstr "перейменований та змінений" + +#: lib\diff.py:205 lib\treewidget.py:342 +msgid "renamed" +msgstr "перейменований" + +#: lib\diff.py:207 lib\treewidget.py:344 +msgid "modified" +msgstr "змінений" + +#: lib\diffview.py:461 msgid "Last modified:" msgstr "Останні зміни" -#: lib\diffview.py:420 +#: lib\diffview.py:462 msgid "Status:" msgstr "Стан:" -#: lib\diffview.py:421 +#: lib\diffview.py:463 msgid "Kind:" msgstr "Тип:" -#: lib\diffview.py:422 +#: lib\diffview.py:464 msgid "Properties:" msgstr "Властивості:" -#: lib\diffview.py:668 +#: lib\diffview.py:726 #, python-format msgid "[binary file (%d bytes)]" msgstr "" -#: lib\diffview.py:843 +#: lib\diffview.py:925 msgid "\\ No newline at end of file" msgstr "\\ No newline at end of file" -#: lib\diffwindow.py:92 +#: lib\diffwindow.py:80 #, python-format msgid "Working Tree for %s" msgstr "Рабоча копія для %s" -#: lib\diffwindow.py:94 +#: lib\diffwindow.py:82 msgid "Working Tree" msgstr "Рабоча копія" -#: lib\diffwindow.py:113 +#: lib\diffwindow.py:101 #, python-format msgid "Rev %(rev)s for %(branch)s" msgstr "Ревізія %(rev)s для %(branch)s" -#: lib\diffwindow.py:115 +#: lib\diffwindow.py:103 #, python-format msgid "Rev %s" msgstr "Ревізія %s" -#: lib\diffwindow.py:118 +#: lib\diffwindow.py:106 #, python-format msgid "Revid: %(revid)s for %(branch)s" msgstr "" -#: lib\diffwindow.py:120 +#: lib\diffwindow.py:108 #, python-format msgid "Revid: %s" msgstr "Revid: %s" -#: lib\diffwindow.py:123 +#: lib\diffwindow.py:111 msgid "Merge Preview" msgstr "Результат об'єднання" -#: lib\diffwindow.py:171 lib\treewidget.py:331 -msgid "removed" -msgstr "видалений" - -#: lib\diffwindow.py:173 lib\treewidget.py:329 -msgid "added" -msgstr "доданий" - -#: lib\diffwindow.py:175 -msgid "renamed and modified" -msgstr "перейменований та змінений" - -#: lib\diffwindow.py:177 lib\treewidget.py:342 -msgid "renamed" -msgstr "перейменований" - -#: lib\diffwindow.py:179 lib\treewidget.py:344 -msgid "modified" -msgstr "змінений" - -#: lib\diffwindow.py:387 +#: lib\diffwindow.py:215 msgid "&Find" msgstr "" -#: lib\diffwindow.py:389 +#: lib\diffwindow.py:217 msgid "Find on active panel" msgstr "" -#: lib\diffwindow.py:396 lib/widgets\shelvelist.py:108 +#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:109 msgid "Unidiff" msgstr "Unidiff" -#: lib\diffwindow.py:398 +#: lib\diffwindow.py:226 msgid "Toggle between Side by side and Unidiff view modes" msgstr "" -#: lib\diffwindow.py:410 lib\main.py:274 lib\util.py:73 -#: lib/widgets\shelve.py:355 lib/widgets\shelvelist.py:197 +#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73 +#: lib/widgets\shelve.py:367 lib/widgets\shelvelist.py:201 msgid "&Refresh" msgstr "&Оновити" -#: lib\diffwindow.py:421 +#: lib\diffwindow.py:249 msgid "&External Diff" msgstr "" -#: lib\diffwindow.py:423 +#: lib\diffwindow.py:251 msgid "Launch an external diff application" msgstr "" -#: lib\diffwindow.py:437 lib/widgets\shelvelist.py:113 +#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:114 msgid "&Complete" msgstr "" -#: lib\diffwindow.py:453 lib/widgets\shelve.py:301 -#: lib/widgets\shelvelist.py:120 +#: lib\diffwindow.py:281 lib/widgets\shelve.py:311 +#: lib/widgets\shelvelist.py:121 msgid "Tab width" msgstr "" -#: lib\diffwindow.py:463 +#: lib\diffwindow.py:291 msgid "Left side tab width" msgstr "" -#: lib\diffwindow.py:473 +#: lib\diffwindow.py:301 msgid "Right side tab width" msgstr "" -#: lib\diffwindow.py:489 +#: lib\diffwindow.py:317 msgid "Left side encoding" msgstr "" -#: lib\diffwindow.py:499 +#: lib\diffwindow.py:327 msgid "Right side encoding" msgstr "" -#: lib\diffwindow.py:505 +#: lib\diffwindow.py:333 msgid "&Ignore whitespace changes" msgstr "" -#: lib\diffwindow.py:570 lib/widgets\shelve.py:448 +#: lib\diffwindow.py:398 lib/widgets\shelve.py:460 #, python-format msgid "%d file" msgid_plural "%d files" @@ -734,19 +768,19 @@ msgstr[1] "%d файли" msgstr[2] "%d файлів" -#: lib\diffwindow.py:648 +#: lib\diffwindow.py:477 #, python-format msgid "" "File %s is not versioned.\n" "Operation aborted." msgstr "" -#: lib\diffwindow.py:650 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 +#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206 #: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988 msgid "&Close" msgstr "&Закрити" -#: lib\diffwindow.py:656 +#: lib\diffwindow.py:485 msgid "No changes found." msgstr "" @@ -834,6 +868,52 @@ msgid "No changes selected to revert" msgstr "" +#: lib\ignore.py:37 lib\ignore.py:113 +msgid "Ignore" +msgstr "" + +#: lib\ignore.py:49 +msgid "Unknown Files" +msgstr "" + +#: lib\ignore.py:58 +msgid "Extension" +msgstr "" + +#: lib\ignore.py:59 +msgid "Ignore as" +msgstr "" + +#: lib\ignore.py:67 +#, fuzzy +msgid "No action" +msgstr "Місцезнаходження:" + +#: lib\ignore.py:70 +msgid "Ignore all files with this extension" +msgstr "" + +#: lib\ignore.py:74 +msgid "Case-insensitive pattern" +msgstr "" + +#: lib\ignore.py:77 +msgid "Ignore by basename" +msgstr "" + +#: lib\ignore.py:79 +msgid "Ignore by fullname" +msgstr "" + +#: lib\ignore.py:227 +#, fuzzy +msgid "Cancelled" +msgstr "&Скасувати" + +#: lib\ignore.py:228 +msgid "No action selected" +msgstr "" + #: lib\info.py:38 lib\ui_info.py:88 lib\ui_info.py:90 msgid "Info" msgstr "Інформація" @@ -888,7 +968,7 @@ msgid "Messages and File text (indexed)" msgstr "" -#: lib\log.py:565 lib\logwidget.py:158 +#: lib\log.py:565 lib\logwidget.py:162 msgid "Show &differences..." msgstr "Показати різницю" @@ -946,91 +1026,91 @@ msgid "bug #%s" msgstr "bug #%s" -#: lib\logwidget.py:130 +#: lib\logwidget.py:134 msgid "Show file &differences" msgstr "" -#: lib\logwidget.py:136 +#: lib\logwidget.py:140 msgid "Show all &differences" msgstr "" -#: lib\logwidget.py:142 +#: lib\logwidget.py:146 msgid "Show file &differences..." msgstr "" -#: lib\logwidget.py:147 +#: lib\logwidget.py:151 msgid "Show all &differences..." msgstr "" -#: lib\logwidget.py:164 +#: lib\logwidget.py:168 msgid "Show &tree..." msgstr "Показати файли" -#: lib\logwidget.py:184 +#: lib\logwidget.py:188 msgid "Tag &revision..." msgstr "" -#: lib\logwidget.py:187 +#: lib\logwidget.py:191 msgid "R&evert to this revision" msgstr "" -#: lib\logwidget.py:191 +#: lib\logwidget.py:195 msgid "&Update to this revision" msgstr "" -#: lib\logwidget.py:199 +#: lib\logwidget.py:203 msgid "&Cherry pick" msgstr "" -#: lib\logwidget.py:205 +#: lib\logwidget.py:209 msgid "Re&verse Cherry pick" msgstr "" -#: lib\logwidget.py:441 +#: lib\logwidget.py:445 #, python-format msgid "Revert to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:444 +#: lib\logwidget.py:448 #, python-format msgid "Revert %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:449 lib\revert.py:54 lib\subprocess.py:185 -#: lib\treewidget.py:1946 +#: lib\logwidget.py:453 lib\revert.py:54 lib\subprocess.py:186 +#: lib\treewidget.py:1953 msgid "Revert" msgstr "Повернути" -#: lib\logwidget.py:463 +#: lib\logwidget.py:467 #, python-format msgid "Update to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:466 +#: lib\logwidget.py:470 #, python-format msgid "Update %s to revision %s revid:%s." msgstr "" -#: lib\logwidget.py:487 +#: lib\logwidget.py:491 #, python-format msgid "Cherry-pick revisions %s - %s from %s to %s." msgstr "" -#: lib\logwidget.py:494 +#: lib\logwidget.py:498 msgid "Cherry-pick" msgstr "" -#: lib\logwidget.py:507 +#: lib\logwidget.py:511 #, python-format msgid "Reverse cherry-pick revisions %s - %s" msgstr "" -#: lib\logwidget.py:510 +#: lib\logwidget.py:514 #, python-format msgid "Reverse cherry-pick revisions %s - %s in %s." msgstr "" -#: lib\logwidget.py:516 +#: lib\logwidget.py:520 msgid "Reverse cherry-pick" msgstr "" @@ -1130,9 +1210,9 @@ #, python-format msgid "" "QBzr — A graphical user interface for Bazaar
Version " -"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © 2006-" -"2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" +"%(qbzr_version)s (bzrlib %(bzrlib_version)s)

Copyright © " +"2006-2008 Lukáš Lalinský and others

http://bazaar-vcs.org/QBzr" msgstr "" #: lib\main.py:472 @@ -1159,7 +1239,7 @@ msgid "Version" msgstr "" -#: lib\plugins.py:58 lib\subprocess.py:401 +#: lib\plugins.py:58 lib\subprocess.py:402 msgid "Description" msgstr "Опис" @@ -1184,7 +1264,7 @@ msgid "(no description)" msgstr "" -#: lib\pull.py:251 lib\subprocess.py:176 +#: lib\pull.py:251 lib\subprocess.py:177 msgid "Working tree has uncommitted changes." msgstr "" @@ -1344,100 +1424,100 @@ msgid "Revisions:" msgstr "" -#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121 -#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:500 +#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120 +#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:507 msgid "Shelve Manager" msgstr "" -#: lib\shelvewindow.py:86 lib/widgets\shelve.py:332 lib/widgets\shelve.py:336 -#: lib/widgets\shelve.py:610 lib/widgets\shelve.py:649 -#: lib/widgets\shelve.py:654 lib/widgets\shelve.py:700 -#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:472 +#: lib\shelvewindow.py:85 lib/widgets\shelve.py:344 lib/widgets\shelve.py:348 +#: lib/widgets\shelve.py:622 lib/widgets\shelve.py:661 +#: lib/widgets\shelve.py:666 lib/widgets\shelve.py:712 +#: lib/widgets\shelve.py:717 lib/widgets\shelvelist.py:479 msgid "Shelve" msgstr "" -#: lib\shelvewindow.py:87 +#: lib\shelvewindow.py:86 msgid "View shelved changes" msgstr "" -#: lib\subprocess.py:153 +#: lib\subprocess.py:154 msgid "&Retry" msgstr "" -#: lib\subprocess.py:439 +#: lib\subprocess.py:440 msgid "Ready" msgstr "" -#: lib\subprocess.py:510 +#: lib\subprocess.py:512 msgid "Starting..." msgstr "Запуск..." -#: lib\subprocess.py:571 +#: lib\subprocess.py:575 msgid "Could not locate \"bzr.exe\"." msgstr "" -#: lib\subprocess.py:590 +#: lib\subprocess.py:594 msgid "Could not locate \"bzr\" script." msgstr "" -#: lib\subprocess.py:611 +#: lib\subprocess.py:615 msgid "Aborting..." msgstr "Припиняється..." -#: lib\subprocess.py:622 lib\subprocess.py:745 +#: lib\subprocess.py:626 lib\subprocess.py:760 msgid "Finished!" msgstr "" -#: lib\subprocess.py:652 lib\uifactory.py:108 +#: lib\subprocess.py:653 lib\uifactory.py:108 msgid "Enter Password" msgstr "" -#: lib\subprocess.py:662 lib\uifactory.py:119 +#: lib\subprocess.py:663 lib\uifactory.py:119 msgid "Enter Username" msgstr "" -#: lib\subprocess.py:725 lib\subprocess.py:748 +#: lib\subprocess.py:740 lib\subprocess.py:763 msgid "Failed!" msgstr "" -#: lib\subprocess.py:728 +#: lib\subprocess.py:743 msgid "Failed to start bzr." msgstr "" -#: lib\subprocess.py:730 +#: lib\subprocess.py:745 #, python-format msgid "Error while running bzr. (error code: %d)" msgstr "" -#: lib\subprocess.py:738 +#: lib\subprocess.py:753 msgid "Aborted!" msgstr "" -#: lib\switch.py:45 +#: lib\switch.py:46 msgid "Switch" msgstr "" -#: lib\switch.py:56 +#: lib\switch.py:57 msgid "Switch checkout" msgstr "" -#: lib\switch.py:64 +#: lib\switch.py:65 msgid "Heavyweight checkout:" msgstr "" -#: lib\switch.py:68 +#: lib\switch.py:69 msgid "Lightweight checkout:" msgstr "" -#: lib\switch.py:75 +#: lib\switch.py:76 msgid "Checkout of branch:" msgstr "" -#: lib\switch.py:88 +#: lib\switch.py:89 msgid "Switch to branch:" msgstr "" -#: lib\switch.py:112 +#: lib\switch.py:113 msgid "Create Branch before switching" msgstr "" @@ -1544,86 +1624,86 @@ msgid "x-bit" msgstr "" -#: lib\treewidget.py:352 lib/widgets\shelve.py:274 -#: lib/widgets\shelvelist.py:88 +#: lib\treewidget.py:352 lib/widgets\shelve.py:284 +#: lib/widgets\shelvelist.py:89 msgid "File Name" msgstr "" -#: lib\treewidget.py:1295 +#: lib\treewidget.py:1302 msgid "Unchanged" msgstr "" -#: lib\treewidget.py:1296 +#: lib\treewidget.py:1303 msgid "Changed" msgstr "" -#: lib\treewidget.py:1297 +#: lib\treewidget.py:1304 msgid "Unversioned" msgstr "" -#: lib\treewidget.py:1298 +#: lib\treewidget.py:1305 msgid "Ignored" msgstr "" -#: lib\treewidget.py:1675 +#: lib\treewidget.py:1682 msgid "&Open" msgstr "" -#: lib\treewidget.py:1678 +#: lib\treewidget.py:1685 msgid "&View file" msgstr "" -#: lib\treewidget.py:1681 +#: lib\treewidget.py:1688 msgid "Show &annotate" msgstr "" -#: lib\treewidget.py:1684 +#: lib\treewidget.py:1691 msgid "Show &log" msgstr "" -#: lib\treewidget.py:1702 +#: lib\treewidget.py:1709 msgid "Mark conflict &resolved" msgstr "" -#: lib\treewidget.py:1707 +#: lib\treewidget.py:1714 msgid "&Add" msgstr "" -#: lib\treewidget.py:1710 +#: lib\treewidget.py:1717 msgid "&Revert" msgstr "" -#: lib\treewidget.py:1713 +#: lib\treewidget.py:1720 msgid "Re&name" msgstr "" -#: lib\treewidget.py:1774 +#: lib\treewidget.py:1781 msgid "&Mark as moved and renamed" msgstr "" -#: lib\treewidget.py:1776 +#: lib\treewidget.py:1783 msgid "&Mark as moved" msgstr "" -#: lib\treewidget.py:1778 +#: lib\treewidget.py:1785 msgid "&Mark as renamed" msgstr "" -#: lib\treewidget.py:1947 +#: lib\treewidget.py:1954 msgid "Do you really want to revert the selected file(s)?" msgstr "" -#: lib\treewidget.py:1980 +#: lib\treewidget.py:1987 msgid "External Merge" msgstr "" -#: lib\treewidget.py:2060 +#: lib\treewidget.py:2067 msgid "" "Some of the files selected cannot be recovered if removed. Are you sure you " "want to remove these files?" msgstr "" -#: lib\treewidget.py:2075 +#: lib\treewidget.py:2082 msgid "Select / deselect all" msgstr "" @@ -1646,13 +1726,6 @@ msgid "&From:" msgstr "" -#: lib\ui_branch.py:102 lib\ui_branch.py:104 lib\ui_init.py:120 -#: lib\ui_merge.py:65 lib\ui_new_tree.py:132 lib\ui_new_tree.py:134 -#: lib\ui_pull.py:63 lib\ui_push.py:65 lib\ui_update_branch.py:85 -#: lib\ui_update_checkout.py:79 -msgid "Browse..." -msgstr "" - #: lib\ui_branch.py:103 msgid "&To:" msgstr "&Куди:" @@ -2055,186 +2128,186 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "delete file" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "rename" msgstr "" -#: lib/widgets\shelve.py:71 +#: lib/widgets\shelve.py:74 msgid "add file" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify text" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify target" msgstr "" -#: lib/widgets\shelve.py:72 +#: lib/widgets\shelve.py:75 msgid "modify binary" msgstr "" -#: lib/widgets\shelve.py:262 +#: lib/widgets\shelve.py:270 msgid "Enter the shelve message" msgstr "" -#: lib/widgets\shelve.py:274 +#: lib/widgets\shelve.py:284 msgid "Hunks" msgstr "" -#: lib/widgets\shelve.py:296 +#: lib/widgets\shelve.py:306 msgid "Complete" msgstr "Завершено" -#: lib/widgets\shelve.py:314 +#: lib/widgets\shelve.py:324 msgid "Previous hunk" msgstr "" -#: lib/widgets\shelve.py:316 +#: lib/widgets\shelve.py:326 msgid "Next hunk" msgstr "" -#: lib/widgets\shelve.py:319 +#: lib/widgets\shelve.py:329 msgid "Use editor" msgstr "" -#: lib/widgets\shelve.py:333 +#: lib/widgets\shelve.py:345 msgid "Destroy" msgstr "" -#: lib/widgets\shelve.py:342 +#: lib/widgets\shelve.py:354 msgid "Select all" msgstr "" -#: lib/widgets\shelve.py:345 +#: lib/widgets\shelve.py:357 msgid "Unselect all" msgstr "" -#: lib/widgets\shelve.py:352 lib/widgets\shelvelist.py:194 +#: lib/widgets\shelve.py:364 lib/widgets\shelvelist.py:198 msgid "&Layout" msgstr "" -#: lib/widgets\shelve.py:611 +#: lib/widgets\shelve.py:623 msgid "Change editor is not defined." msgstr "" -#: lib/widgets\shelve.py:642 +#: lib/widgets\shelve.py:654 #, python-format msgid "Delete changes of %d file without shelving" msgid_plural "Delete changes of %d files without shelving" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:646 +#: lib/widgets\shelve.py:658 #, python-format msgid "Shelve changes of %d file" msgid_plural "Shelve changes of %d files" msgstr[0] "" msgstr[1] "" -#: lib/widgets\shelve.py:655 +#: lib/widgets\shelve.py:667 msgid "No changes selected." msgstr "" -#: lib/widgets\shelve.py:692 lib/widgets\shelvelist.py:280 +#: lib/widgets\shelve.py:704 lib/widgets\shelvelist.py:284 msgid "" msgstr "" -#: lib/widgets\shelve.py:701 -msgid "Operation aborted because working tree has pending marges." +#: lib/widgets\shelve.py:713 +msgid "Operation aborted because working tree has pending merges." msgstr "" -#: lib/widgets\shelve.py:705 +#: lib/widgets\shelve.py:718 msgid "Operation aborted because target files has been changed." msgstr "" -#: lib/widgets\shelve.py:940 +#: lib/widgets\shelve.py:958 msgid "Edited by change editor.\n" msgstr "" -#: lib/widgets\shelvelist.py:83 +#: lib/widgets\shelvelist.py:84 msgid "Id" msgstr "" -#: lib/widgets\shelvelist.py:117 +#: lib/widgets\shelvelist.py:118 msgid "Ignore whitespace" msgstr "" -#: lib/widgets\shelvelist.py:169 lib/widgets\shelvelist.py:177 +#: lib/widgets\shelvelist.py:173 lib/widgets\shelvelist.py:181 msgid "Unshelve" msgstr "" -#: lib/widgets\shelvelist.py:170 +#: lib/widgets\shelvelist.py:174 msgid "Dry run" msgstr "" -#: lib/widgets\shelvelist.py:172 +#: lib/widgets\shelvelist.py:176 msgid "Keep" msgstr "" -#: lib/widgets\shelvelist.py:174 +#: lib/widgets\shelvelist.py:178 msgid "Delete" msgstr "" -#: lib/widgets\shelvelist.py:188 +#: lib/widgets\shelvelist.py:192 msgid "Show filelist" msgstr "" -#: lib/widgets\shelvelist.py:478 +#: lib/widgets\shelvelist.py:485 #, python-format msgid "Apply changes in shelf[%(id)d], and remove from the shelf" msgstr "" -#: lib/widgets\shelvelist.py:480 +#: lib/widgets\shelvelist.py:487 #, python-format msgid "" "Simulate to apply changes in shelf[%(id)d] without changing working tree" msgstr "" -#: lib/widgets\shelvelist.py:482 +#: lib/widgets\shelvelist.py:489 #, python-format msgid "Apply changes in shelf[%(id)d], but keep it shelved" msgstr "" -#: lib/widgets\shelvelist.py:484 +#: lib/widgets\shelvelist.py:491 #, python-format msgid "Remove shelf[%(id)d] without applying" msgstr "" -#: lib/widgets\toolbars.py:71 +#: lib/widgets\toolbars.py:74 msgid "Find: " msgstr "" -#: lib/widgets\toolbars.py:87 +#: lib/widgets\toolbars.py:90 msgid "Previous" msgstr "" -#: lib/widgets\toolbars.py:91 +#: lib/widgets\toolbars.py:94 msgid "Next" msgstr "" -#: lib/widgets\toolbars.py:95 +#: lib/widgets\toolbars.py:98 msgid "Case sensitive" msgstr "" -#: lib/widgets\toolbars.py:97 +#: lib/widgets\toolbars.py:100 msgid "Whole words" msgstr "" -#: lib/widgets\toolbars.py:106 +#: lib/widgets\toolbars.py:109 msgid "Close find" msgstr "" -#: lib/widgets\toolbars.py:249 +#: lib/widgets\toolbars.py:300 msgid "Layout" msgstr "" -#: lib/widgets\toolbars.py:263 +#: lib/widgets\toolbars.py:314 #, python-format msgid "Layout %d" msgstr "" diff -Nru qbzr-0.22.1/README.txt qbzr-0.22.2/README.txt --- qbzr-0.22.1/README.txt 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/README.txt 2012-04-05 15:26:01.000000000 +0000 @@ -75,6 +75,7 @@ * qconflicts - Show conflicts. * qdiff - Show differences in working tree in a GUI window. * qexport - Export current or past revision to a destination directory or archive. + * qignore - Ignore files or patterns. * qinfo - Shows information about the current location. * qinit - Initializes a new branch or shared repository. * qlog - Show log of a repository, branch, file, or directory in a Qt window. diff -Nru qbzr-0.22.1/setup.py qbzr-0.22.2/setup.py --- qbzr-0.22.1/setup.py 2012-02-21 08:52:47.000000000 +0000 +++ qbzr-0.22.2/setup.py 2012-04-05 15:26:01.000000000 +0000 @@ -13,7 +13,7 @@ setup(name='qbzr', description='Qt4 frontend for Bazaar', keywords='plugin bzr qt qbzr', - version='0.22.1', + version='0.22.2', url='http://wiki.bazaar.canonical.com/QBzr', license='GPL', author='QBzr Developers',