Change information text about downloading generations

diff --git a/fstogedcom.py b/fstogedcom.py
index 5be2d84da797a7c40cb4b84bb98c04575461fe81..712d48a68899b5944a4258c613ff3cd8cda24843 100644 (file)
--- a/fstogedcom.py
+++ b/fstogedcom.py
@@ -417,7 +417,7 @@ class Download(Frame):
         self.form.destroy()
         self.title.config(text='FamilySearch to GEDCOM')
         self.btn_valid.config(state='disabled')
-        self.info(_('Download starting individuals...'))
+        self.info(_('Downloading starting individuals...'))
         self.info_tree = True
         self.tree.add_indis(todo)
         todo = set(todo)
@@ -426,7 +426,7 @@ class Download(Frame):
             if not todo:
                 break
             done |= todo
-            self.info(_('Download ') + str(i + 1) + _('th generation of ancestors...'))
+            self.info(_('Downloading %s. of generations of ancestors...') % (i + 1))
             todo = self.tree.add_parents(todo) - done
 
         todo = set(self.tree.indi.keys())
@@ -435,11 +435,11 @@ class Download(Frame):
             if not todo:
                 break
             done |= todo
-            self.info(_('Download ') + str(i + 1) + _('th generation of descendants...'))
+            self.info(_('Downloading %s. of generations of descendants...') % (i + 1))
             todo = self.tree.add_children(todo) - done
 
         if self.options.spouses.get():
-            self.info(_('Download spouses and marriage information...'))
+            self.info(_('Downloading spouses and marriage information...'))
             todo = set(self.tree.indi.keys())
             self.tree.add_spouses(todo)
         ordi = self.options.ordinances.get()
@@ -461,7 +461,7 @@ class Download(Frame):
                 await future
 
         loop = asyncio.get_event_loop()
-        self.info(_('Download notes') + (((',' if cont else _(' and')) + _(' ordinances')) if ordi else '') + (_(' and contributors') if cont else '') + '...')
+        self.info(_('Downloading notes') + (((',' if cont else _(' and')) + _(' ordinances')) if ordi else '') + (_(' and contributors') if cont else '') + '...')
         loop.run_until_complete(download_stuff(loop))
 
         self.tree.reset_num()

diff --git a/getmyancestors.py b/getmyancestors.py
index 092e8dc5d630d7b8bad8f17b94f0e11fa4e57125..6c94bfd81913d5ef01f6eae5904d78e44cf4b3fc 100755 (executable)
--- a/getmyancestors.py
+++ b/getmyancestors.py
@@ -935,7 +935,7 @@ if __name__ == '__main__':
 
     # add list of starting individuals to the family tree
     todo = args.i if args.i else [fs.get_userid()]
-    print(_('Download starting individuals...'))
+    print(_('Downloading starting individuals...'))
     tree.add_indis(todo)
 
     # download ancestors
@@ -945,7 +945,7 @@ if __name__ == '__main__':
         if not todo:
             break
         done |= todo
-        print(_('Download ') + str(i + 1) + _('th generation of ancestors...'))
+        print(_('Downloading %s. of generations of ancestors...') % (i + 1))
         todo = tree.add_parents(todo) - done
 
     # download descendants
@@ -955,12 +955,12 @@ if __name__ == '__main__':
         if not todo:
             break
         done |= todo
-        print(_('Download ') + str(i + 1) + _('th generation of descendants...'))
+        print(_('Downloading %s. of generations of descendants...') % (i + 1))
         todo = tree.add_children(todo) - done
 
     # download spouses
     if args.m:
-        print(_('Download spouses and marriage information...'))
+        print(_('Downloading spouses and marriage information...'))
         todo = set(tree.indi.keys())
         tree.add_spouses(todo)
 
@@ -981,7 +981,7 @@ if __name__ == '__main__':
             await future
 
     loop = asyncio.get_event_loop()
-    print(_('Download notes') + (((',' if args.r else _(' and')) + _(' ordinances')) if args.c else '') + (_(' and contributors') if args.r else '') + '...')
+    print(_('Downloading notes') + (((',' if args.r else _(' and')) + _(' ordinances')) if args.c else '') + (_(' and contributors') if args.r else '') + '...')
     loop.run_until_complete(download_stuff(loop))
 
     # compute number for family relationships and print GEDCOM file

diff --git a/translation.py b/translation.py
index 1ca6789f519b025035e1924be9a5950b45abaa53..8eead429659980ac45213a67ff7ec78c6f28b5eb 100644 (file)
--- a/translation.py
+++ b/translation.py
@@ -98,19 +98,16 @@ translations = {
         'ru': 'Название племени',
         'zh': '部落名字'
     },
-    'Download starting individuals...': {
+    'Downloading starting individuals...': {
         'fr': 'Téléchargement des personnes de départ...',
     },
-    'th generation of ancestors...': {
-        'fr': 'e génération d\'ancêtres...',
+    'Downloading %s. of generations of descendants...': {
+        'fr': 'Téléchargement de %s génération(s) de descendants...',
     },
-    'th generation of descendants...': {
-        'fr': 'e génération de descendants...',
-    },
-    'Download spouses and marriage information...': {
+    'Downloading spouses and marriage information...': {
         'fr': 'Téléchargement des conjoints et des informations de mariage...',
     },
-    'Download notes': {
+    'Downloading notes': {
         'fr': 'Téléchargement des notes',
     },
     ' and': {
@@ -197,8 +194,8 @@ translations = {
     'Options': {
         'fr': 'Options',
     },
-    'Download': {
-        'fr': 'Télécharger',
+    'Downloading %s. of generations of ancestors...': {
+        'fr': "Téléchargement de %s génération(s) d'ancêtres...",
     },
     'Save': {
         'fr': 'Sauvegarder',