We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 24 files · Browse files at b4f40f6011c7 Showing diff from parent e1c8b3657b31 1fb070779fba Diff from another changeset...
-
i18n/tortoisehg/cs.po
-
i18n/tortoisehg/da.po
-
i18n/tortoisehg/de.po
-
i18n/tortoisehg/en_GB.po
-
i18n/tortoisehg/es.po
-
i18n/tortoisehg/fa.po
-
i18n/tortoisehg/fr.po
-
i18n/tortoisehg/hr.po
-
i18n/tortoisehg/hu.po
-
i18n/tortoisehg/it.po
-
i18n/tortoisehg/ja.po
-
i18n/tortoisehg/ko.po
-
i18n/tortoisehg/oc.po
-
i18n/tortoisehg/pl.po
-
i18n/tortoisehg/pt.po
-
i18n/tortoisehg/pt_BR.po
-
i18n/tortoisehg/ru.po
-
i18n/tortoisehg/sv.po
-
i18n/tortoisehg/tr.po
-
i18n/tortoisehg/uk.po
-
i18n/tortoisehg/zh_CN.po
-
i18n/tortoisehg/zh_TW.po
-
tortoisehg/hgtk/gdialog.py
-
tortoisehg/hgtk/quickop.py
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -8,13 +8,13 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: Peer Sommerlund <peer.sommerlund@gmail.com>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-04-03 19:38+0000\n"
+"PO-Revision-Date: 2010-04-05 13:36+0000\n"
"Last-Translator: peso <peer.sommerlund@gmail.com>\n"
"Language-Team: Danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-04 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2485,7 +2485,8 @@msgid "%s (submitted)"
msgstr "%s (indsendt)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr ""
@@ -5342,7 +5343,8 @@msgid "F_old"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr ""
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -8,13 +8,13 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-03-31 20:43+0000\n"
+"PO-Revision-Date: 2010-04-05 13:56+0000\n"
"Last-Translator: paolof <gp.fadel@gmail.com>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 06:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:06+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2499,7 +2499,8 @@msgid "%s (submitted)"
msgstr "%s (inviato)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr "%s (in attesa)"
@@ -5423,7 +5424,8 @@msgid "F_old"
msgstr "C_ollassa"
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr "Riordina"
|
||
|
@@ -8,13 +8,13 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-03-31 16:55+0000\n"
+"PO-Revision-Date: 2010-04-05 11:59+0000\n"
"Last-Translator: Yuki Kodama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 06:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:06+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2471,7 +2471,8 @@msgid "%s (submitted)"
msgstr "%s (送信完了)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr "%s (保留中)"
@@ -5292,7 +5293,8 @@msgid "F_old"
msgstr "統合(_F)"
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr "並べ替え"
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -8,20 +8,15 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-03-31 20:26+0000\n"
-"Last-Translator: Wagner Bruna <Unknown>\n"
+"PO-Revision-Date: 2010-04-05 13:18+0000\n"
+"Last-Translator: Yuki Kodama <Unknown>\n"
"Language-Team: Portuguese <pt@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 06:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: tortoisehg\hgtk\history.py:417 tortoisehg\hgtk\history.py:1957
-#: tortoisehg\hgtk\synch.py:79
-msgid "Push"
-msgstr "Push"
-
#: TortoiseHgOverlayServer.py:36
msgid "TortoiseHg Overlay Icon Server"
msgstr "Servidor de Ícones Sobrepostos do TortoiseHg"
@@ -2442,6 +2437,11 @@msgid "Outgoing"
msgstr "Outgoing"
+#: tortoisehg\hgtk\history.py:417 tortoisehg\hgtk\history.py:1957
+#: tortoisehg\hgtk\synch.py:79
+msgid "Push"
+msgstr "Push"
+
#: tortoisehg\hgtk\history.py:419
msgid "Email..."
msgstr "Email..."
@@ -2490,7 +2490,8 @@msgid "%s (submitted)"
msgstr "%s (enviada)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr "%s (pendente)"
@@ -5401,7 +5402,8 @@msgid "F_old"
msgstr "C_ombinar"
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr "Reordenar"
|
||
|
@@ -8,13 +8,13 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: Alil Adamov <diagiman@gmail.com>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-04-01 10:26+0000\n"
+"PO-Revision-Date: 2010-04-05 12:09+0000\n"
"Last-Translator: Alil Adamov <diagiman@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-02 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:06+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2496,7 +2496,8 @@msgid "%s (submitted)"
msgstr "%s (предоставлена)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr "%s (осталась)"
@@ -5417,7 +5418,8 @@msgid "F_old"
msgstr "Объединить"
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr "Измение порядка"
@@ -6744,6 +6746,9 @@#~ msgid "View Changelog"
#~ msgstr "Показать Журнал Изменений"
+#~ msgid "Undo last commit"
+#~ msgstr "Отменить последнюю фиксацию"
+
#~ msgid "Copyright 2009 TK Soh and others"
#~ msgstr "Copyright 2009 TK Soh и другие"
@@ -6752,3 +6757,10 @@
#~ msgid "Options..."
#~ msgstr "Настройки..."
+
+#~ msgid ""
+#~ "Normalize file line endings during and after patch to lf or crlf. Strict "
+#~ "does no normalization. Default: strict"
+#~ msgstr ""
+#~ "Пребразовывать переносы строк файла при применении и после к lf или crlf. "
+#~ "Strict - без преобразований. По умолчанию: strict"
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: tortoisehg\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: Turkish <tr@li.org>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-04-05 03:05+0000\n"
-"Last-Translator: Göksel GÜREN <Unknown>\n"
+"PO-Revision-Date: 2010-04-05 12:18+0000\n"
+"Last-Translator: Turkish <Unknown>\n"
"Language-Team: Turkish <tr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-05 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2417,7 +2417,8 @@msgid "%s (submitted)"
msgstr ""
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr ""
@@ -5172,7 +5173,8 @@msgid "F_old"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr ""
@@ -5914,3 +5916,6 @@#: tortoisehg\util\version.py:17
msgid "repository %s not found"
msgstr ""
+
+#~ msgid "Options..."
+#~ msgstr "Seçenekler..."
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -721,6 +721,7 @@ name = self.get_setting_name()
if name:
self.settings = settings.Settings(name)
+ self.load_settings()
# dialog size
defsize = self.get_defsize()
@@ -730,6 +731,9 @@ # signal handler
self.connect('realize', self.realized)
+ # disable entire dialog
+ self.set_sensitive(False)
+
### Overridable Functions ###
def get_title(self, reponame):
@@ -765,6 +769,9 @@ def command_done(self, returncode, useraborted, *args):
pass
+ def before_show(self):
+ pass
+
def before_close(self):
return True
@@ -798,6 +805,16 @@ # add Abort button
self.action_area.add(self.buttons['abort'])
+ # enable entire dialog
+ self.set_sensitive(True)
+
+ # focus on default button if needs
+ name = self.get_default_button()
+ if name:
+ btn = self.buttons.get(name)
+ if btn:
+ btn.grab_focus()
+
def do_switch_to(self, mode, cmd=True):
if mode == MODE_NORMAL:
normal = True
@@ -831,7 +848,7 @@ self.do_switch_to(MODE_WORKING)
self.cmd.execute(cmdline, cmd_done)
- ### Signal Handler ###
+ ### Signal Handlers ###
def realized(self, *args):
# set title
@@ -855,18 +872,11 @@ gtklib.idle_add_single_call(self.destroy)
return
- # focus on default button if needs
- name = self.get_default_button()
- if name:
- btn = self.buttons.get(name)
- if btn:
- btn.grab_focus()
-
# signal handler
self.connect('response', self.dialog_response)
# prepare to show
- self.load_settings()
+ self.before_show()
self.vbox.show_all()
gtklib.idle_add_single_call(self.after_init)
@@ -884,7 +894,7 @@ return # close dialog
# Cancel button or dialog closing by the user
elif response_id in (gtk.RESPONSE_CLOSE, gtk.RESPONSE_DELETE_EVENT):
- if hasattr(self, 'cmd') and self.cmd.is_alive():
+ if self.cmd.is_alive():
ret = Confirm(_('Confirm Abort'), [], self,
_('Do you want to abort?')).run()
if ret == gtk.RESPONSE_YES:
|
||
|
@@ -21,6 +21,9 @@ 'revert': (_('Select files to revert'), _('Revert')),
'remove': (_('Select files to remove'), _('Remove')),}
+DEFAULT_SIZE = (450, 300)
+DEFAULT_POS = (0, 0)
+
class QuickOpDialog(gdialog.GDialog):
""" Dialog for performing quick dirstate operations """
def __init__(self, command, pats):
@@ -46,7 +49,10 @@ return 'hg.ico'
def get_defsize(self):
- return (450, 300)
+ return self.defsize
+
+ def get_setting_name(self):
+ return 'quickop'
def get_body(self, vbox):
os.chdir(self.repo.root)
@@ -208,6 +214,36 @@ else:
self.cmd.set_result(_('Failed'), style='error')
+ def before_show(self):
+ # restore dialog state
+ if self.defmax:
+ self.maximize()
+
+ # restore dialog position
+ screen = self.get_screen()
+ w, h = screen.get_width(), screen.get_height()
+ x, y = self.defpos
+ if x >= 0 and x < w and y >= 0 and y < h:
+ self.move(x, y)
+
+ def load_settings(self):
+ self.defsize = self.settings.get_value('size', DEFAULT_SIZE)
+ self.defpos = self.settings.get_value('pos', DEFAULT_POS)
+ self.defmax = self.settings.get_value('maximize', False)
+
+ def store_settings(self):
+ state = self.window.get_state()
+ ismaximized = bool(state & gtk.gdk.WINDOW_STATE_MAXIMIZED)
+ if ismaximized or state & gtk.gdk.WINDOW_STATE_ICONIFIED:
+ self.settings.set_value('size', DEFAULT_SIZE)
+ self.settings.set_value('pos', DEFAULT_POS)
+ else:
+ rect = self.get_allocation()
+ self.settings.set_value('size', (rect.width, rect.height))
+ self.settings.set_value('pos', self.get_position())
+ self.settings.set_value('maximize', ismaximized)
+ self.settings.write()
+
### End of Overriding Section ###
def operation(self):
|
||
Add a tag
Loading...