Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset b487ed3e4174…

Parents 16dc0d9a44aa…

Parents 74162cb38473…

by Yuki KODAMA

Changes to 2 files · Browse files at b487ed3e4174 Showing diff from parent 16dc0d9a44aa 74162cb38473 Diff from another changeset...

Change 1 of 9 Show Entire File i18n/​tortoisehg/​uk.po Stacked
 
8
9
10
11
 
12
13
14
15
16
17
 
18
19
20
 
2749
2750
2751
2752
 
2753
2754
2755
 
2761
2762
2763
2764
 
2765
2766
2767
2768
 
2769
2770
2771
 
2801
2802
2803
2804
 
2805
2806
2807
2808
 
2809
2810
2811
 
2841
2842
2843
2844
 
2845
2846
2847
 
2857
2858
2859
2860
 
2861
2862
2863
 
2906
2907
2908
2909
 
2910
2911
2912
 
2914
2915
2916
2917
 
2918
2919
2920
2921
 
2922
2923
2924
 
2942
2943
2944
2945
 
2946
2947
2948
 
8
9
10
 
11
12
13
14
15
16
 
17
18
19
20
 
2749
2750
2751
 
2752
2753
2754
2755
 
2761
2762
2763
 
2764
2765
2766
2767
 
2768
2769
2770
2771
 
2801
2802
2803
 
2804
2805
2806
2807
 
2808
2809
2810
2811
 
2841
2842
2843
 
2844
2845
2846
2847
 
2857
2858
2859
 
2860
2861
2862
2863
 
2906
2907
2908
 
2909
2910
2911
2912
 
2914
2915
2916
 
2917
2918
2919
2920
 
2921
2922
2923
2924
 
2942
2943
2944
 
2945
2946
2947
2948
@@ -8,13 +8,13 @@
 "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"  "POT-Creation-Date: 2010-02-22 23:55+0000\n" -"PO-Revision-Date: 2010-03-08 14:06+0000\n" +"PO-Revision-Date: 2010-03-10 12:54+0000\n"  "Last-Translator: kosha <Unknown>\n"  "Language-Team: Ukrainian <uk@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-03-09 04:37+0000\n" +"X-Launchpad-Export-Date: 2010-03-11 05:09+0000\n"  "X-Generator: Launchpad (build Unknown)\n"    #: thgtaskbar.py:36 @@ -2749,7 +2749,7 @@
   #: tortoisehg\hgtk\history.py:1209  msgid "Import Revision to MQ" -msgstr "Import Revision to MQ" +msgstr "Імпорт редакцій до MQ"    #: tortoisehg\hgtk\history.py:1211  msgid "Strip Revision..." @@ -2761,11 +2761,11 @@
   #: tortoisehg\hgtk\history.py:1235  msgid "Mark as Good" -msgstr "Mark as Good" +msgstr "Відмітити як добрі"    #: tortoisehg\hgtk\history.py:1236  msgid "Mark as Bad" -msgstr "Mark as Bad" +msgstr "Відмітити як сумнівні"    #: tortoisehg\hgtk\history.py:1237  msgid "Skip Testing" @@ -2801,11 +2801,11 @@
   #: tortoisehg\hgtk\history.py:1290  msgid "Import from here to selected to MQ" -msgstr "Import from here to selected to MQ" +msgstr "імпортувати звідси, до MQ"    #: tortoisehg\hgtk\history.py:1294  msgid "Select common ancestor revision" -msgstr "Select common ancestor revision" +msgstr "Виберіть перегляді спільних попередників"    #: tortoisehg\hgtk\history.py:1348  msgid "Load more" @@ -2841,7 +2841,7 @@
   #: tortoisehg\hgtk\history.py:1406  msgid "Import patches" -msgstr "Імпорт патчів" +msgstr "Імпорт латок"    #: tortoisehg\hgtk\history.py:1409  msgid "Determine and mark outgoing changesets" @@ -2857,7 +2857,7 @@
   #: tortoisehg\hgtk\history.py:1416  msgid "Stop current transaction" -msgstr "Зупинити поточну справу" +msgstr "Зупинити поточну дію"    #: tortoisehg\hgtk\history.py:1448  msgid "After Pull:" @@ -2906,7 +2906,7 @@
   #: tortoisehg\hgtk\history.py:1689  msgid "%d incoming changesets" -msgstr "%d incoming changesets" +msgstr "%d вхідних змін"    #: tortoisehg\hgtk\history.py:1691  msgid "Aborted incoming" @@ -2914,11 +2914,11 @@
   #: tortoisehg\hgtk\history.py:1693  msgid "No incoming changesets" -msgstr "No incoming changesets" +msgstr "Немає вхідних змін"    #: tortoisehg\hgtk\history.py:1697  msgid "Checking incoming changesets..." -msgstr "Checking incoming changesets..." +msgstr "Перевірка наявності вхідних змін..."    #: tortoisehg\hgtk\history.py:1716  msgid "Accept incoming previewed changesets" @@ -2942,7 +2942,7 @@
   #: tortoisehg\hgtk\history.py:1770  msgid "Failed to preview, a bundle file unrelated to this repository" -msgstr "Failed to preview, a bundle file unrelated to this repository" +msgstr "Не вдається переглянути, файли не пов'язані з цим сховищем"    #: tortoisehg\hgtk\history.py:1775  msgid "Failed to preview, not a Mercurial bundle file"
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgemail.py Stacked
 
211
212
213
 
 
 
 
 
 
 
 
 
 
214
215
216
217
218
 
219
220
221
 
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
 
228
229
230
231
@@ -211,11 +211,21 @@
  self.repo = None   return   + def getfromaddr(ui): + """Get sender address in the same manner as patchbomb""" + addr = ui.config('email', 'from') or ui.config('patchbomb', 'from') + if addr: + return addr + try: + return repo.ui.username() + except error.Abort: + return '' +   if initial:   # Only zap these fields at startup   self._tobox.child.set_text(hglib.fromutf(repo.ui.config('email', 'to', '')))   self._ccbox.child.set_text(hglib.fromutf(repo.ui.config('email', 'cc', ''))) - self._frombox.child.set_text(hglib.fromutf(repo.ui.config('email', 'from', ''))) + self._frombox.child.set_text(hglib.fromutf(getfromaddr(repo.ui)))   self._subjbox.child.set_text(hglib.fromutf(repo.ui.config('email', 'subject', '')))   self.tooltips.set_tip(self._eventbox,   _('Patch series description is sent in initial summary'