Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

Merge with stable

Changeset 43e01b6953b0…

Parents 3c0c6268ec97…

Parents ad0091266184…

by Steve Borho

Changes to 6 files · Browse files at 43e01b6953b0 Showing diff from parent 3c0c6268ec97 ad0091266184 Diff from another changeset...

Show Entire File i18n/​tortoisehg/​da.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 3 Show Entire File i18n/​tortoisehg/​fr.po Stacked
 
8
9
10
11
12
 
 
13
14
15
16
17
18
 
 
19
20
21
 
60
61
62
63
 
64
65
66
 
498
499
500
501
 
502
503
504
 
8
9
10
 
 
11
12
13
14
15
16
 
 
17
18
19
20
21
 
60
61
62
 
63
64
65
66
 
498
499
500
 
501
502
503
504
@@ -8,14 +8,14 @@
 "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"  "POT-Creation-Date: 2010-12-28 20:44+0000\n" -"PO-Revision-Date: 2010-10-02 09:37+0000\n" -"Last-Translator: André Sintzoff <Unknown>\n" +"PO-Revision-Date: 2011-01-15 21:03+0000\n" +"Last-Translator: Jason Vaillancourt <Unknown>\n"  "Language-Team: French <fr@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-12-29 05:04+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Launchpad-Export-Date: 2011-01-16 05:10+0000\n" +"X-Generator: Launchpad (build 12177)\n"    #: TortoiseHgOverlayServer.py:36  msgid "TortoiseHg Overlay Icon Server" @@ -60,7 +60,7 @@
   #: tortoisehg\hgtk\archive.py:62  msgid "Only files modified/created in this revision" -msgstr "" +msgstr "Seulement les fichiers modifiés/créés dans cette version"    #: tortoisehg\hgtk\archive.py:69 tortoisehg\hgtk\clone.py:70  #: tortoisehg\hgtk\hginit.py:55 tortoisehg\hgtk\thgconfig.py:394 @@ -498,7 +498,7 @@
   #: tortoisehg\hgtk\chunks.py:73  msgid "File is larger than the specified max size.\n" -msgstr "" +msgstr "Le fichier est plus grand que la limite maximale spécifiée.\n"    #: tortoisehg\hgtk\chunks.py:74 tortoisehg\hgtk\chunks.py:86  msgid "Hunk selection is disabled for this file.\n"
Change 1 of 2 Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
 
8
9
10
11
 
12
13
14
15
16
17
18
 
 
19
20
21
 
1137
1138
1139
1140
 
1141
1142
1143
1144
 
1145
1146
1147
1148
 
1149
1150
1151
1152
 
1153
1154
1155
 
8
9
10
 
11
12
13
14
15
16
 
 
17
18
19
20
21
 
1137
1138
1139
 
1140
1141
1142
1143
 
1144
1145
1146
1147
 
1148
1149
1150
1151
 
1152
1153
1154
1155
@@ -8,14 +8,14 @@
 "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"  "POT-Creation-Date: 2010-12-28 20:44+0000\n" -"PO-Revision-Date: 2010-12-28 21:28+0000\n" +"PO-Revision-Date: 2011-01-21 20:56+0000\n"  "Last-Translator: Wagner Bruna <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-12-29 05:07+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Launchpad-Export-Date: 2011-01-22 05:05+0000\n" +"X-Generator: Launchpad (build 12177)\n"    #: TortoiseHgOverlayServer.py:36  msgid "TortoiseHg Overlay Icon Server" @@ -1137,19 +1137,19 @@
   #: tortoisehg\hgtk\cslist.py:400  msgid "Selecting %(sel)d of %(total)d, displaying all items" -msgstr "Selecionando %(sel)d de %(total)d, mostrando todos os ítens" +msgstr "Selecionando %(sel)d de %(total)d, mostrando todos os itens"    #: tortoisehg\hgtk\cslist.py:403  msgid "Selecting %(sel)d, displaying %(count)d of %(total)d items" -msgstr "Selecionando %(sel)d, mostrando %(count)d de %(total)d ítens" +msgstr "Selecionando %(sel)d, mostrando %(count)d de %(total)d itens"    #: tortoisehg\hgtk\cslist.py:407  msgid "Displaying all items" -msgstr "Mostrando todos os ítens" +msgstr "Mostrando todos os itens"    #: tortoisehg\hgtk\cslist.py:409  msgid "Displaying %(count)d of %(total)d items" -msgstr "Mostrando %(count)d de %(total)d ítens" +msgstr "Mostrando %(count)d de %(total)d itens"    #: tortoisehg\hgtk\datamine.py:45  msgid "%s - datamine"
Change 1 of 8 Show Entire File tortoisehg/​hgtk/​shellconf.py Stacked
 
108
109
110
 
 
 
 
 
 
 
 
 
 
 
 
111
112
113
 
165
166
167
 
168
169
170
 
194
195
196
 
 
 
197
198
199
 
258
259
260
 
261
262
263
 
273
274
275
 
 
276
277
278
 
300
301
302
 
303
304
305
 
325
326
327
 
328
329
330
 
341
342
343
 
344
345
346
 
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
 
177
178
179
180
181
182
183
 
207
208
209
210
211
212
213
214
215
 
274
275
276
277
278
279
280
 
290
291
292
293
294
295
296
297
 
319
320
321
322
323
324
325
 
345
346
347
348
349
350
351
 
362
363
364
365
366
367
368
@@ -108,6 +108,18 @@
  subbutton.connect('clicked', self.sub_clicked)   mbbox.add(subbutton)   + # menu behavior group + mbframe = gtk.Frame(_('Menu Behavior')) + mbframe.set_border_width(2) + cmenuvbox.pack_start(mbframe, True, True, 2) + + mbbox = gtk.VBox() + mbframe.add(mbbox) + hbox = gtk.HBox() + mbbox.pack_start(hbox, False, False, 2) + self.hide_context_menu = gtk.CheckButton(_('Hide context menu outside repositories')) + hbox.pack_start(self.hide_context_menu, False, False, 2) +   # Icons page   iconsframe = self.add_page(notebook, _('Icons'))   iconsvbox = gtk.VBox() @@ -165,6 +177,7 @@
    def connect_apply(checkbutton):   checkbutton.connect('toggled', lambda x: self.apply.set_sensitive(True)) + connect_apply(self.hide_context_menu)   connect_apply(self.enableAddedHandler)   connect_apply(self.enableUnversionedHandler)   connect_apply(self.enableIgnoredHandler) @@ -194,6 +207,9 @@
  # Tooltips   tips = gtklib.Tooltips()   + tooltip = _('Do not show menu items on unversioned folders' + ' (use shift + click to override)') + tips.set_tip(self.hide_context_menu, tooltip)   tooltip = _('Show overlay icons in Mercurial repositories')   tips.set_tip(self.ovenable, tooltip)   self.ovenable.connect('toggled', self.ovenable_toggled) @@ -258,6 +274,7 @@
  return frame     def load_shell_configs(self): + hide_context_menu = False   overlayenable = True   localdisks = False   promoteditems = 'commit' @@ -273,6 +290,8 @@
  from _winreg import HKEY_CURRENT_USER, OpenKey, QueryValueEx   hkey = OpenKey(HKEY_CURRENT_USER, r'Software\TortoiseHg')   t = ('1', 'True') + try: hide_context_menu = QueryValueEx(hkey, 'HideMenuOutsideRepo')[0] in t + except EnvironmentError: pass   try: overlayenable = QueryValueEx(hkey, 'EnableOverlays')[0] in t   except EnvironmentError: pass   try: localdisks = QueryValueEx(hkey, 'LocalDisksOnly')[0] in t @@ -300,6 +319,7 @@
  except (ImportError, WindowsError):   pass   + self.hide_context_menu.set_active(hide_context_menu)   self.ovenable.set_active(overlayenable)   self.lclonly.set_active(localdisks)   self.lclonly.set_sensitive(overlayenable) @@ -325,6 +345,7 @@
  self.topmmodel.set_sort_column_id(1, gtk.SORT_ASCENDING)     def store_shell_configs(self): + hide_context_menu = self.hide_context_menu.get_active() and '1' or '0'   overlayenable = self.ovenable.get_active() and '1' or '0'   localdisks = self.lclonly.get_active() and '1' or '0'   show_taskbaricon = self.show_taskbaricon.get_active() and '1' or '0' @@ -341,6 +362,7 @@
  try:   from _winreg import HKEY_CURRENT_USER, CreateKey, SetValueEx, REG_SZ, REG_DWORD   hkey = CreateKey(HKEY_CURRENT_USER, r"Software\TortoiseHg") + SetValueEx(hkey, 'HideMenuOutsideRepo', 0, REG_SZ, hide_context_menu)   SetValueEx(hkey, 'EnableOverlays', 0, REG_SZ, overlayenable)   SetValueEx(hkey, 'LocalDisksOnly', 0, REG_SZ, localdisks)   SetValueEx(hkey, 'ShowTaskbarIcon', 0, REG_SZ, show_taskbaricon)
Change 1 of 1 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
470
471
472
473
474
 
 
 
 
 
 
475
476
477
 
470
471
472
 
 
473
474
475
476
477
478
479
480
481
@@ -470,8 +470,12 @@
  /* shift key is not down */   if (!isHgrepo)   { - /* We are not inside a repo -> don't show thg menu entries */ - return S_OK; + std::string cval; + if (GetRegistryConfig("HideMenuOutsideRepo", cval) != 0 && cval == "1") + { + /* We are not inside a repo -> don't show thg menu entries */ + return S_OK; + }   }   }