Merge branch 'maintenance/gramps51' of https://github.com/gramps-project/gramps into maintenance/gramps51

gramps/cli/plug/__init__.py

@@ -519,8 +519,8 @@ class CommandLineReport:
                         self.format = tree_format["class"]
             if self.format is None:
                 # Pick the first one as the default.
-                self.format = tree_format.FORMATS[0]["class"]
+                self.format = treedoc.FORMATS[0]["class"]
-                _chosen_format = tree_format.FORMATS[0]["type"]
+                _chosen_format = treedoc.FORMATS[0]["type"]
         else:
             self.format = None
         if _chosen_format and _format_str:

gramps/gen/datehandler/__init__.py

@@ -35,6 +35,7 @@ import logging
 # Gramps modules
 #
 #-------------------------------------------------------------------------
+from ..utils.grampslocale import GrampsLocale
 from ..const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.sgettext
 # import prerequisites for localized handlers
@@ -72,16 +73,20 @@ from . import _date_uk
 from . import _date_zh_CN
 from . import _date_zh_TW
 
+# the following makes sure we use the LC_TIME value for date display & parsing
+dlocale = GrampsLocale(lang=glocale.calendar)
+
+
 # Initialize global parser
 try:
     if LANG in LANG_TO_PARSER:
-        parser = LANG_TO_PARSER[LANG](plocale=glocale)
+        parser = LANG_TO_PARSER[LANG](plocale=dlocale)
     else:
-        parser = LANG_TO_PARSER[LANG_SHORT](plocale=glocale)
+        parser = LANG_TO_PARSER[LANG_SHORT](plocale=dlocale)
 except:
     logging.warning(
         _("Date parser for '%s' not available, using default") % LANG)
-    parser = LANG_TO_PARSER["C"](plocale=glocale)
+    parser = LANG_TO_PARSER["C"](plocale=dlocale)
 
 # Initialize global displayer
 try:
@@ -92,13 +97,13 @@ except:
 
 try:
     if LANG in LANG_TO_DISPLAY:
-        displayer = LANG_TO_DISPLAY[LANG](val, blocale=glocale)
+        displayer = LANG_TO_DISPLAY[LANG](val, blocale=dlocale)
     else:
-        displayer = LANG_TO_DISPLAY[LANG_SHORT](val, blocale=glocale)
+        displayer = LANG_TO_DISPLAY[LANG_SHORT](val, blocale=dlocale)
 except:
     logging.warning(
         _("Date displayer for '%s' not available, using default") % LANG)
-    displayer = LANG_TO_DISPLAY["C"](val, blocale=glocale)
+    displayer = LANG_TO_DISPLAY["C"](val, blocale=dlocale)
 
 
 # Import utility functions

gramps/gen/db/generic.py

@@ -535,7 +535,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
         self.undo_history_callback = None
         self.modified = 0
         self.transaction = None
-        self.abort_possible = False
+        self.abort_possible = True
         self._bm_changes = 0
         self.has_changed = False
         self.surname_list = []

gramps/gen/lib/grampstype.py

@@ -288,10 +288,12 @@ class GrampsType(object, metaclass=GrampsTypeMeta):
             else:
                 return self.__value == value[0]
         else:
-            if value.value == self._CUSTOM:
+            if value.value == self._CUSTOM and self.__value == self._CUSTOM:
                 return self.__string == value.string
-            else:
+            elif value.value != self._CUSTOM and self.__value != self._CUSTOM:
                 return self.__value == value.value
+            else:
+                return False
 
     def __ne__(self, value):
         return not self.__eq__(value)

gramps/gen/lib/styledtext.py

@@ -299,6 +299,7 @@ class StyledText:
         """
         if self._tags:
             the_tags = [tag.serialize() for tag in self._tags]
+            the_tags.sort()
         else:
             the_tags = []
 

gramps/gen/lib/test/styledtext_test.py

@@ -64,11 +64,11 @@ class Test1(unittest.TestCase):
         C = self.C.join([self.A, self.S, deepcopy(self.B)])
         C = C.replace('X', StyledText('_', [self.T3]))
         _C = ('123_456\ncleartext\nabc_def',
-              [((1, ''), 'v1', [(0, 2), (2, 3)]),
+              [((0, ''), 'v3', [(3, 4)]),
-               ((0, ''), 'v3', [(3, 4)]),
+               ((0, ''), 'v3', [(21, 22)]),
+               ((1, ''), 'v1', [(0, 2), (2, 3)]),
                ((1, ''), 'v1', [(4, 6)]),
                ((2, ''), 'v2', [(19, 21), (18, 21)]),
-               ((0, ''), 'v3', [(21, 22)]),
                ((2, ''), 'v2', [(22, 23), (22, 25)])])
         self.assertEqual(C.serialize(), _C)
 

gramps/gen/plug/_manager.py

@@ -83,7 +83,7 @@ class BasePluginManager:
 
     def __init__(self):
         """ This function should only be run once by get_instance() """
-        if BasePluginManager.__instance is not 1:
+        if BasePluginManager.__instance != 1:
             raise Exception("This class is a singleton. "
                             "Use the get_instance() method")
 

gramps/gen/plug/_pluginreg.py

@@ -1135,7 +1135,7 @@ class PluginRegister:
 
     def __init__(self):
         """ This function should only be run once by get_instance() """
-        if PluginRegister.__instance is not 1:
+        if PluginRegister.__instance != 1:
             raise Exception("This class is a singleton. "
                             "Use the get_instance() method")
         self.stable_only = True

gramps/gen/plug/menu/_enumeratedlist.py

@@ -62,6 +62,7 @@ class EnumeratedListOption(Option):
         :type value: int
         :return: nothing
         """
+        self.ini_value = value
         Option.__init__(self, label, value)
         self.__items = []
         self.__xml_items = []
@@ -138,6 +139,8 @@ class EnumeratedListOption(Option):
         """
         if value in (v for v, d in self.__items):
             Option.set_value(self, value)
+        elif value == self.ini_value:
+            return
         else:
             logging.warning(_("Value '%(val)s' not found for option '%(opt)s'") %
                              {'val' : str(value), 'opt' : self.get_label()})

gramps/grampsapp.py

@@ -126,7 +126,7 @@ if win():
             pass  # ok
         elif not os.path.isdir(HOME_DIR):
             os.makedirs(HOME_DIR)
-        sys.stdout = sys.stderr = open(logfile, "w")
+        sys.stdout = sys.stderr = open(logfile, "w", encoding='utf-8')
 stderrh = logging.StreamHandler(sys.stderr)
 stderrh.setFormatter(form)
 stderrh.setLevel(logging.DEBUG)

gramps/gui/editors/displaytabs/eventrefmodel.py

@@ -46,7 +46,7 @@ from html import escape
 #
 #-------------------------------------------------------------------------
 from ...widgets.undoablebuffer import UndoableBuffer
-from gramps.gen.lib import EventRoleType
+from gramps.gen.lib import (EventRoleType, EventType, Date)
 from gramps.gen.datehandler import get_date, get_date_valid
 from gramps.gen.config import config
 from gramps.gen.utils.db import get_participant_from_event
@@ -175,6 +175,11 @@ class EventRefModel(Gtk.TreeStore):
         """
         date = event.get_date_object()
         if date and self.start_date:
+            if (date == self.start_date and date.modifier == Date.MOD_NONE
+                    and not (event.get_type().is_death_fallback() or
+                             event.get_type() == EventType.DEATH)):
+                return ""
+            else:
                 return (date - self.start_date).format(precision=age_precision)
         else:
             return ""

gramps/gui/managedwindow.py

@@ -32,6 +32,14 @@ the create/deletion of dialog windows.
 import os
 from io import StringIO
 import html
+import logging
+
+#-------------------------------------------------------------------------
+#
+# Set up logging
+#
+#-------------------------------------------------------------------------
+_LOG = logging.getLogger(".")
 #-------------------------------------------------------------------------
 #
 # GNOME/GTK
@@ -575,6 +583,9 @@ class ManagedWindow:
 
         Takes care of closing children and removing itself from menu.
         """
+        if hasattr(self, 'opened') and not self.opened:
+            _LOG.warning("Tried to close a ManagedWindow more than once.")
+            return  # in case close somehow gets called again
         self.opened = False
         self._save_position(save_config=False)  # the next line will save it
         self._save_size()

gramps/gui/pluginmanager.py

@@ -71,7 +71,7 @@ class GuiPluginManager(Callback):
 
     def __init__(self):
         """ This function should only be run once by get_instance() """
-        if GuiPluginManager.__instance is not 1:
+        if GuiPluginManager.__instance != 1:
             raise Exception("This class is a singleton. "
                             "Use the get_instance() method")
 

gramps/gui/viewmanager.py

@@ -875,9 +875,6 @@ class ViewManager(CLIManager):
         """
         Perform necessary actions when a page is changed.
         """
-        if not self.dbstate.is_open():
-            return
-
         self.__disconnect_previous_page()
 
         self.active_page = self.pages[page_num]

gramps/gui/views/treemodels/treebasemodel.py

@@ -587,7 +587,8 @@ class TreeBaseModel(GObject.GObject, Gtk.TreeModel, BaseModel):
         if dfilter:
             cdb = CacheProxyDb(self.db)
             for handle in dfilter.apply(cdb, tree=True,
-                                        user=User(parent=self.uistate.window)):
+                                        user=User(parent=self.uistate.window,
+                                                  uistate=self.uistate)):
                 status_ppl.heartbeat()
                 data = data_map(handle)
                 add_func(handle, data)

gramps/plugins/db/dbapi/dbapi.py

@@ -231,6 +231,10 @@ class DBAPI(DbGeneric):
         _LOG.debug("    %sDBAPI %s transaction begin for '%s'",
                    "Batch " if transaction.batch else "",
                    hex(id(self)), transaction.get_description())
+        if transaction.batch:
+            # A batch transaction does not store the commits
+            # Aborting the session completely will become impossible.
+            self.abort_possible = False
         self.transaction = transaction
         self.dbapi.begin()
         return transaction

gramps/plugins/db/dbapi/sqlite.py

@@ -101,6 +101,7 @@ class Connection:
         self.__cursor = self.__connection.cursor()
         self.__connection.create_function("regexp", 2, regexp)
         self.__collations = []
+        self.__tmap = str.maketrans('-.@=;', '_____')
         self.check_collation(glocale)
 
     def check_collation(self, locale):
@@ -110,7 +111,10 @@ class Connection:
         :param locale: Locale to be checked.
         :param type: A GrampsLocale object.
         """
-        collation = locale.get_collation()
+        #PySQlite3 permits only ascii alphanumerics and underscores in
+        #collation names so first translate any old-style Unicode locale
+        #delimiters to underscores.
+        collation = locale.get_collation().translate(self.__tmap)
         if collation not in self.__collations:
             self.__connection.create_collation(collation, locale.strcoll)
 

gramps/plugins/gramplet/events.py

@@ -32,6 +32,7 @@ from gi.repository import Gtk
 from gramps.gui.editors import EditEvent
 from gramps.gui.listmodel import ListModel, NOSORT
 from gramps.gen.plug import Gramplet
+from gramps.gen.lib import (EventType, Date)
 from gramps.gen.plug.report.utils import find_spouse
 from gramps.gui.dbguielement import DbGUIElement
 from gramps.gen.display.place import displayer as place_displayer
@@ -129,6 +130,11 @@ class Events(Gramplet, DbGUIElement):
         date = event.get_date_object()
         start_date = self.cached_start_date
         if date and start_date:
+            if (date == start_date and date.modifier == Date.MOD_NONE
+                    and not (event.get_type().is_death_fallback() or
+                             event.get_type() == EventType.DEATH)):
+                return ""
+            else:
                 return (date - start_date).format(precision=age_precision)
         else:
             return ""

gramps/plugins/lib/libgedcom.py

@@ -7776,6 +7776,7 @@ class GedcomParser(UpdateCallback):
             # have got deleted by Chack and repair because the record is empty.
             # If we find the source record, the title is overwritten in
             # __source_title.
+            if not src.title:
                 src.set_title(line.data)
         self.dbase.commit_source(src, self.trans)
         self.__parse_source_reference(citation, level, src.handle, state)

gramps/plugins/lib/maps/messagelayer.py

@@ -113,7 +113,7 @@ class MessageLayer(GObject.GObject, osmgpsmap.MapLayer):
         """
         Add a message
         """
-        self.message += "\n%s" % message if self.message is not "" else message
+        self.message += "\n%s" % message if self.message else message
 
     def do_draw(self, gpsmap, ctx):
         """

gramps/plugins/lib/maps/osmgps.py

@@ -64,6 +64,7 @@ _ = glocale.translation.sgettext
 from gramps.gen.config import config
 from gramps.gui.dialog import ErrorDialog
 from gramps.gen.constfunc import get_env_var
+from gramps.gen.const import VERSION_DIR
 
 #-------------------------------------------------------------------------
 #
@@ -138,7 +139,19 @@ class OsmGps:
                 ErrorDialog(_("Can't create "
                               "tiles cache directory %s") % cache_path,
                             parent=self.uistate.window)
-                return self.vbox
+                gini = os.path.join(VERSION_DIR, 'gramps.ini')
+                ErrorDialog(_("You must verify and change the tiles cache"
+                              "\n..."
+                              "\n[geography]"
+                              "\n..."
+                              "\npath='bad/path'"
+                              "\n..."
+                              "\nin the gramps.ini file :\n%s"
+                              "\n\nBefore to change the gramps.ini file, "
+                              "you need to close gramps"
+                              "\n\nThe next errors will be normal") % gini,
+                            parent=self.uistate.window)
+                return None
 
         self.change_map(None, config.get("geography.map_service"))
         return self.vbox

gramps/plugins/tool/removeunused.py

@@ -172,7 +172,11 @@ class RemoveUnused(tool.Tool, ManagedWindow, UpdateCallback):
                                         GObject.TYPE_STRING,
                                         GObject.TYPE_STRING,
                                         GObject.TYPE_STRING)
+        # a short term Gtk introspection means we need to try both ways:
+        if hasattr(self.real_model, "sort_new_with_model"):
             self.sort_model = self.real_model.sort_new_with_model()
+        else:
+            self.sort_model = Gtk.TreeModelSort.new_with_model(self.real_model)
         self.warn_tree.set_model(self.sort_model)
 
         self.renderer = Gtk.CellRendererText()

gramps/plugins/tool/verify.py

@@ -1791,7 +1791,7 @@ class OldAgeButNoDeath(PersonRule):
 class BirthEqualsDeath(PersonRule):
     """ test if a person's birth date is the same as their death date """
     ID = 33
-    SEVERITY = Rule.ERROR
+    SEVERITY = Rule.WARNING
     def broken(self):
         """ return boolean indicating whether this rule is violated """
         birth_date = get_birth_date(self.db, self.obj)

gramps/plugins/webreport/narrativeweb.py

@@ -1687,7 +1687,7 @@ class NavWebOptions(MenuReportOptions):
         cright.set_help(_("The copyright to be used for the web files"))
         addopt("cright", cright)
 
-        self.__css = EnumeratedListOption(('StyleSheet'), CSS["default"]["id"])
+        self.__css = EnumeratedListOption(_('StyleSheet'), CSS["default"]["id"])
         for (dummy_fname, gid) in sorted(
                 [(CSS[key]["translation"], CSS[key]["id"])
                  for key in list(CSS.keys())]):
@@ -1891,7 +1891,7 @@ class NavWebOptions(MenuReportOptions):
             _("Max width of initial image"), _DEFAULT_MAX_IMG_WIDTH, 0, 2000)
         self.__maxinitialimagewidth.set_help(
             _("This allows you to set the maximum width "
-              "of the image shown on the media page. Set to 0 for no limit."))
+              "of the image shown on the media page."))
         addopt("maxinitialimagewidth", self.__maxinitialimagewidth)
 
         self.__maxinitialimageheight = NumberOption(

po/ca.po

@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-29 17:20+0100\n"
+"POT-Creation-Date: 2020-04-18 12:57+0200\n"
-"PO-Revision-Date: 2020-03-03 00:00+0100\n"
+"PO-Revision-Date: 2020-04-18 13:05+0200\n"
 "Last-Translator: Joan Creus <joan.creusandreu at gmail dot com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
@@ -1091,14 +1091,14 @@ msgstr "cap"
 msgid ":"
 msgstr ":"
 
-#: ../gramps/gen/datehandler/__init__.py:83
+#: ../gramps/gen/datehandler/__init__.py:88
 #, python-format
 msgid "Date parser for '%s' not available, using default"
 msgstr ""
 "L'analitzador de dates per a '%s' no està disponible, s'utilitza el "
 "predeterminat"
 
-#: ../gramps/gen/datehandler/__init__.py:100
+#: ../gramps/gen/datehandler/__init__.py:105
 #, python-format
 msgid "Date displayer for '%s' not available, using default"
 msgstr ""
@@ -1529,51 +1529,51 @@ msgstr "Des"
 #. DateParser code!
 #: ../gramps/gen/datehandler/_datestrings.py:116
 msgid "alternative month names for January||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:117
 msgid "alternative month names for February||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:118
 msgid "alternative month names for March||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:119
 msgid "alternative month names for April||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:120
 msgid "alternative month names for May||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:121
 msgid "alternative month names for June||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:122
 msgid "alternative month names for July||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:123
 msgid "alternative month names for August||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:124
 msgid "alternative month names for September||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:125
 msgid "alternative month names for October||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:126
 msgid "alternative month names for November||"
-msgstr ""
+msgstr "|"
 
 #: ../gramps/gen/datehandler/_datestrings.py:127
 msgid "alternative month names for December||"
-msgstr ""
+msgstr "|"
 
 #. Must appear in the order indexed by Date.CAL_... numeric constants
 #: ../gramps/gen/datehandler/_datestrings.py:131 ../gramps/gen/lib/date.py:609
@@ -6221,7 +6221,7 @@ msgid "Values"
 msgstr "Valors"
 
 #: ../gramps/gen/lib/date.py:719 ../gramps/gen/lib/placename.py:99
-#: ../gramps/gen/lib/styledtext.py:321
+#: ../gramps/gen/lib/styledtext.py:322
 #: ../gramps/gen/plug/report/_constants.py:54 ../gramps/gui/clipboard.py:613
 #: ../gramps/gui/clipboard.py:621 ../gramps/gui/configure.py:1396
 #: ../gramps/gui/filters/sidebar/_notesidebarfilter.py:101
@@ -7894,11 +7894,11 @@ msgstr "Làpida"
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../gramps/gen/lib/styledtext.py:317
+#: ../gramps/gen/lib/styledtext.py:318
 msgid "Styled Text"
 msgstr "Text amb estil"
 
-#: ../gramps/gen/lib/styledtext.py:324
+#: ../gramps/gen/lib/styledtext.py:325
 msgid "Styled Text Tags"
 msgstr "Etiquetes del text amb estil"
 
@@ -10851,14 +10851,13 @@ msgid "Show close button in gramplet bar tabs"
 msgstr "Mostra el botó de tancament a les barres de tabulació dels gramplets"
 
 #: ../gramps/gui/configure.py:1352
-#, fuzzy
 msgid "Show close button to simplify removing gramplets from bars."
-msgstr "Mostra el botó de tancament a les barres de tabulació dels gramplets"
+msgstr ""
+"Mostra el botó de tancament per simplificar treure gramplets de les barres."
 
 #: ../gramps/gui/configure.py:1371
-#, fuzzy
 msgid "Default text used for conditions"
-msgstr "L'estil utilitzat pels detalls."
+msgstr "Text predeterminat utilitzat per les condicions"
 
 #: ../gramps/gui/configure.py:1376
 msgid "Missing surname"
@@ -10898,7 +10897,7 @@ msgstr ""
 
 #: ../gramps/gui/configure.py:1488
 msgid "Dates settings used for calculation operations"
-msgstr ""
+msgstr "Opcions de dates utilitzades per operacions de càlcul"
 
 #: ../gramps/gui/configure.py:1494
 msgid "Markup for invalid date format"
@@ -11112,6 +11111,8 @@ msgstr "actualitza"
 #: ../gramps/gui/configure.py:1730
 msgid "Family tree database settings and Backup management"
 msgstr ""
+"Opcions de base de dades de l'arbre genealògic i gestió de còpies de "
+"seguretat"
 
 #: ../gramps/gui/configure.py:1736
 msgid "Database backend"
@@ -11253,8 +11254,8 @@ msgstr ""
 "Aquesta pestanya us dona la possibilitat d'utilitzar un tipus de lletra que "
 "pugui mostrar tots els símbols genealògics.\n"
 "\n"
-"Si marqueu la casella de verificació \"utilitzar símbols\", Gramps utilitzarà"
+"Si marqueu la casella de verificació \"utilitzar símbols\", Gramps "
-" el tipus de lletra seleccionat si existeix."
+"utilitzarà el tipus de lletra seleccionat si existeix."
 
 #: ../gramps/gui/configure.py:1953
 msgid ""
@@ -11275,6 +11276,9 @@ msgid ""
 "before you can continue (10 minutes or more). \n"
 "If you cancel the process, nothing will be changed."
 msgstr ""
+"Vigileu, si cliqueu al botó \"Provar de trobar\" pot trigar una estona abans "
+"no pugueu continuar (10 minuts o més).\n"
+"Si cancel·leu el procés, no es modificarà res."
 
 #: ../gramps/gui/configure.py:1975
 msgid ""
@@ -13637,9 +13641,8 @@ msgid "Add Repository"
 msgstr "Afegeix Repositori"
 
 #: ../gramps/gui/editors/editrepository.py:60
-#, fuzzy
 msgid "manual|New_Repository_dialog"
-msgstr "Dialeg_Nous_Repositoris"
+msgstr "Dialeg_de_Nous_Repositoris"
 
 #: ../gramps/gui/editors/editrepository.py:92
 msgid "Edit Repository"
@@ -14654,7 +14657,6 @@ msgstr ""
 "registre de naixement. "
 
 #: ../gramps/gui/glade/editcitation.glade.h:11
-#, fuzzy
 msgid ""
 "Conveys the submitter's quantitative evaluation of the credibility of a "
 "piece of information, based upon its supporting evidence. It is not intended "
@@ -14669,12 +14671,12 @@ msgstr ""
 "Expressa l'avaluació quantitativa de la credibilitat d'una informació, "
 "segons qui l'aporta, basant-se en les proves que la suporten. No és per "
 "eliminar la necessitat del receptor d'avaluar les proves per si mateix.\n"
-"Molt Baix =Proves no fiables o dades estimades\n"
+"-Molt Baix =Proves no fiables o dades estimades\n"
-"Baix =Fiabilitat de la prova qüestionable (entrevistes, cens, genealogies "
+"-Baix =Fiabilitat de la prova qüestionable (entrevistes, cens, genealogies "
 "orals, o biaix potencial, per exemple, una autobiografia)\n"
-"Alt =Prova secundària, dades registrades oficialment algun temps després de "
+"-Alt =Prova secundària, dades registrades oficialment algun temps després de "
 "l'esdeveniment\n"
-"Molt Alt =Prova directa i primària, o per evidència aclaparadora "
+"-Molt Alt =Prova directa i primària, o per evidència aclaparadora."
 
 #: ../gramps/gui/glade/editcitation.glade.h:16
 #: ../gramps/gui/glade/editevent.glade.h:17
@@ -17526,9 +17528,8 @@ msgid "Quick View"
 msgstr "Vista ràpida"
 
 #: ../gramps/gui/plug/report/_bookdialog.py:92
-#, fuzzy
 msgid "Generate_Book_dialog"
-msgstr "Generar Llibre"
+msgstr "Diàleg_de_Generar_Llibre"
 
 #: ../gramps/gui/plug/report/_bookdialog.py:172
 msgid "Available Books"
@@ -17856,9 +17857,8 @@ msgid "Document Styles"
 msgstr "Estils de Document"
 
 #: ../gramps/gui/plug/report/_styleeditor.py:108
-#, fuzzy
 msgid "manual|Document_Styles_dialog"
-msgstr "Dialeg_defineix_filtre"
+msgstr "Dialeg_d'Estils_de_Document"
 
 #: ../gramps/gui/plug/report/_styleeditor.py:147
 msgid "New Style"
@@ -17887,9 +17887,8 @@ msgid "Style editor"
 msgstr "Editor d'estils"
 
 #: ../gramps/gui/plug/report/_styleeditor.py:242
-#, fuzzy
 msgid "manual|Style_editor_dialog"
-msgstr "Dialeg_editor_llocs"
+msgstr "Dialeg_d'Editor_d'Estils"
 
 #: ../gramps/gui/plug/report/_styleeditor.py:352
 #: ../gramps/gui/plug/report/_styleeditor.py:380
@@ -17980,7 +17979,7 @@ msgstr "Últim Canvi"
 
 #: ../gramps/gui/selectors/selectcitation.py:86
 msgid "manual|Select_Source_or_Citation_selector"
-msgstr "Selector_Selecciona_Font_Cita"
+msgstr "Selector_Selecciona_Font_o_Cita"
 
 #: ../gramps/gui/selectors/selectevent.py:59
 msgid "Select Event"
@@ -17988,11 +17987,11 @@ msgstr "Selecciona un Esdeveniment"
 
 #: ../gramps/gui/selectors/selectevent.py:79
 msgid "manual|Select_Event_selector"
-msgstr "Selector_selecciona_esdeveniment"
+msgstr "Selector_Selecciona_Esdeveniment"
 
 #: ../gramps/gui/selectors/selectfamily.py:76
 msgid "manual|Select_Family_selector"
-msgstr "Selector_selecciona_familia"
+msgstr "Selector_Selecciona_Família"
 
 #: ../gramps/gui/selectors/selectnote.py:64
 msgid "Select Note"
@@ -18000,7 +17999,7 @@ msgstr "Selecciona Nota"
 
 #: ../gramps/gui/selectors/selectnote.py:82
 msgid "manual|Select_Note_selector"
-msgstr "Selector_selecciona_nota"
+msgstr "Selector_Selecciona_Nota"
 
 #: ../gramps/gui/selectors/selectobject.py:67
 msgid "Select Media Object"
@@ -18012,20 +18011,19 @@ msgstr "Selector_Selecciona_Objecte_Audiovisual"
 
 #: ../gramps/gui/selectors/selectperson.py:64
 msgid "manual|Select_Father_selector"
-msgstr "Selector_selecciona_pare"
+msgstr "Selector_Selecciona_Pare"
 
 #: ../gramps/gui/selectors/selectperson.py:66
 msgid "manual|Select_Mother_selector"
-msgstr "Selector_selecciona_mare"
+msgstr "Selector_Selecciona_Mare"
 
 #: ../gramps/gui/selectors/selectperson.py:68
 msgid "manual|Select_Child_selector"
-msgstr "Selector_selecciona_fill"
+msgstr "Selector_Selecciona_Fill"
 
 #: ../gramps/gui/selectors/selectperson.py:70
-#, fuzzy
 msgid "manual|Select_Person_selector"
-msgstr "Selector_selecciona_lloc"
+msgstr "Selector_Selecciona_Persona"
 
 #: ../gramps/gui/selectors/selectplace.py:60
 msgid "Select Place"
@@ -18033,25 +18031,23 @@ msgstr "Selecciona Lloc"
 
 #: ../gramps/gui/selectors/selectplace.py:90
 msgid "manual|Select_Place_selector"
-msgstr "Selector_selecciona_lloc"
+msgstr "Selector_Selecciona_Lloc"
 
 #: ../gramps/gui/selectors/selectrepository.py:59
 msgid "Select Repository"
 msgstr "Selecciona Repositori"
 
 #: ../gramps/gui/selectors/selectrepository.py:75
-#, fuzzy
 msgid "manual|Select_Repository_selector"
-msgstr "Selector_selecciona_mare"
+msgstr "Selector_Selecciona_Repositori"
 
 #: ../gramps/gui/selectors/selectsource.py:59
 msgid "Select Source"
 msgstr "Selecciona Font"
 
 #: ../gramps/gui/selectors/selectsource.py:76
-#, fuzzy
 msgid "manual|Select_Source_selector"
-msgstr "Selector_selecciona_nota"
+msgstr "Selector_Selecciona_Font"
 
 #: ../gramps/gui/spell.py:92
 msgid "Off"
@@ -18686,9 +18682,8 @@ msgid "Add Child to Family"
 msgstr "Afegeix Fill a Família"
 
 #: ../gramps/gui/widgets/grampletbar.py:118
-#, fuzzy
 msgid "Gramplet Bar Menu"
-msgstr "Barra de Gramplets"
+msgstr "Menú de Barra de Gramplets"
 
 #: ../gramps/gui/widgets/grampletbar.py:207
 #: ../gramps/gui/widgets/grampletpane.py:1194
@@ -18805,9 +18800,8 @@ msgid "Progress Information"
 msgstr "Informació de progrés"
 
 #: ../gramps/gui/widgets/reorderfam.py:63
-#, fuzzy
 msgid "manual|Reorder_Relationships_dialog"
-msgstr "Reordena Relacions"
+msgstr "Diàleg_de_Reordena_Relacions"
 
 #: ../gramps/gui/widgets/reorderfam.py:91
 msgid "Reorder Relationships"
@@ -22202,9 +22196,8 @@ msgid "Gramplet showing the events for all the family"
 msgstr "Gramplet que mostra els esdeveniments de tota la família"
 
 #: ../gramps/plugins/gramplet/leak.py:99
-#, fuzzy
 msgid "Referrer"
-msgstr "Referència"
+msgstr "Referent"
 
 #: ../gramps/plugins/gramplet/leak.py:103
 msgid "Uncollected object"
@@ -22407,9 +22400,9 @@ msgid "Active person: %s"
 msgstr "Persona activa: %s"
 
 #: ../gramps/plugins/gramplet/relativegramplet.py:88
-#, fuzzy, python-format
+#, python-format
 msgid "%(count)d. %(relation)s: "
-msgstr "%(person)s, naixement%(relation)s"
+msgstr "%(count)d. %(relation)s: "
 
 #: ../gramps/plugins/gramplet/relativegramplet.py:94
 #, python-format
@@ -24080,20 +24073,22 @@ msgstr ""
 "versió. Si us plau, consulteu:%(gramps_wiki_migrate_two_to_three_url)s"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:1
-#, fuzzy
 msgid ""
 "Source reference\n"
 "(out of Settings)"
-msgstr "Nota de Referència a Font"
+msgstr ""
+"Referència de la font\n"
+"(fora de Configuració)"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:6
 msgid ""
 "Source reference text\n"
 "(Text & import Filename)."
 msgstr ""
+"Text de referència de la Font\n"
+"(Text i Nom de fitxer d'importació)."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:9
-#, fuzzy
 msgid "Attribut"
 msgstr "Atribut"
 
@@ -24102,65 +24097,76 @@ msgid ""
 "Source attribute text\n"
 "(Text, import Filename & (System-)Date)."
 msgstr ""
+"Text de l'atribució de la font (Text, Nom de fitxer d'importació & Data (de "
+"Sistema))."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:12
-#, fuzzy
 msgid "Citation reference."
-msgstr "Referències de Cita"
+msgstr "Referència de Cita."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:15
 msgid ""
 "Citation confidence level\n"
 "(Very low - very high)."
 msgstr ""
+"Nivell de confiança de la Cita\n"
+"(Molt baix - molt alt)."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:18
 msgid ""
 "Citation volume/page text\n"
 "(Text & (System-)Date)."
 msgstr ""
+"Text per al volum/pàgina de la Cita\n"
+"(Text & Data (de Sistema))."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:20
 msgid ""
 "Citation attribute text\n"
 "(Text, import Filename & (System-)Date)."
 msgstr ""
+"Text d'atribució de la Cita\n"
+"(Text, Nom de fitxer d'importació & Data (de Sistema))."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:22
-#, fuzzy
 msgid "Import Text"
-msgstr "Importador"
+msgstr "Text d'importació"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:25
 msgid ""
 "Default Tagtext\n"
 "(out of Settings)."
 msgstr ""
+"Text de l'etiqueta predeterminat\n"
+"(fora de Configuració)."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:28
-#, fuzzy
 msgid "Import Filename."
-msgstr "Importa Arbre Genealògic"
+msgstr "Nom del fitxer d'importació."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:31
 msgid "Default (System-)Date."
-msgstr ""
+msgstr "Data (de Sistema) Predeterminada."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:38
 msgid "Combined default text + filename + date."
-msgstr ""
+msgstr "Combinació de text predeterminat + nom de fitxer + data."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:39
 msgid ""
 "Copy Default Text\n"
 "to all Tag Text'."
 msgstr ""
+"Copiar Text Predeterminat\n"
+"a tots els Textos d'Etiqueta'."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:41
 msgid ""
 "Copy Default Filename\n"
 "to all sensitive Tag Text'."
 msgstr ""
+"Copiar Nom de fitxer Predeterminat\n"
+"a tots els Textos d'Etiqueta sensible'."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:43
 msgid ""
@@ -24177,95 +24183,108 @@ msgid ""
 "Enable/Disable\n"
 "all object tags."
 msgstr ""
+"Activar/Desactivar\n"
+"totes les etiquetes d'objecte."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:48
-#, fuzzy
 msgid "Tag Text"
-msgstr "Text pla"
+msgstr "Text d'Etiqueta"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:49
-#, fuzzy
 msgid "Import Objects"
-msgstr "Esbo_rra Objecte"
+msgstr "Importació d'Objectes"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:50
 msgid ""
 "Enable/Disable\n"
 "Person import."
 msgstr ""
+"Activar/Desactivar\n"
+"Importació de Persona."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:52
 msgid ""
 "Enable/Disable\n"
 "Family import."
 msgstr ""
+"Activar/Desactivar\n"
+"Importació de Família."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:55
 msgid ""
 "Enable/Disable\n"
 "Child import."
 msgstr ""
+"Activar/Desactivar\n"
+"Importació de Fill."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:58
 msgid ""
 "Use original Person\n"
 "Identifier as Gramps ID."
 msgstr ""
+"Utilitzar Identificador de\n"
+"Persona original com a ID Gramps."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:60
 msgid ""
 "Use original Family\n"
 "Identifier as Gramps ID."
 msgstr ""
+"Utilitzar Identificador de\n"
+"Família original com a ID Gramps."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:62
-#, fuzzy
 msgid "Identifier"
-msgstr "Modificador"
+msgstr "Identificador"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:63
-#, fuzzy
 msgid "Name change"
-msgstr "Canviat per última vegada"
+msgstr "Canvi de nom"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:64
-#, fuzzy
 msgid "Event date"
-msgstr "Data d'Esdeveniment"
+msgstr "Data d'esdeveniment"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:66
-#, fuzzy
 msgid ""
 "Store birth date in\n"
 "event description."
-msgstr "Extreure Descripció de l'Esdeveniment"
+msgstr ""
+"Emmagatzemar la data de naixement a\n"
+"la descripció de l'esdeveniment."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:69
-#, fuzzy
 msgid ""
 "Store death date in\n"
 "event description."
-msgstr "Extreure Descripció de l'Esdeveniment"
+msgstr ""
+"Emmagatzemar la data de defunció a\n"
+"la descripció de l'esdeveniment."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:71
 msgid "Diverse"
-msgstr ""
+msgstr "Divers"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:72
 msgid "REFN"
-msgstr ""
+msgstr "REFN"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:73
 msgid ""
 "Store REFN number\n"
 "in event description."
 msgstr ""
+"Desar el número REFN\n"
+"a la descripció de l'esdeveniment."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:75
 msgid ""
 "Use death information\n"
 "as death cause event."
 msgstr ""
+"Utilitzar la informació de defunció\n"
+"com a causa de l'esdeveniment de defunció."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:77
 #, fuzzy
@@ -24273,26 +24292,28 @@ msgid "(-cause)"
 msgstr "Causa"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:78
-#, fuzzy
 msgid "Male surname"
-msgstr "Selecciona cognom"
+msgstr "Cognom masculí"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:79
 msgid ""
 "Change name of male\n"
 "to e.g. wifes name."
 msgstr ""
+"Canviar nom de l'home\n"
+"a p.ex. el nom de la dona."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:81
-#, fuzzy
 msgid "Female surname"
-msgstr "Selecciona cognom"
+msgstr "Cognom femení"
 
 #: ../gramps/plugins/importer/importprogen.glade.h:82
 msgid ""
 "Change name of female\n"
 "to e.g. husbands name."
 msgstr ""
+"Canviar nom de la dona\n"
+"a p.ex. el nom de l'home."
 
 #: ../gramps/plugins/importer/importprogen.glade.h:84
 msgid "Option"
@@ -28828,14 +28849,12 @@ msgid "Importing persons."
 msgstr "Important persones."
 
 #: ../gramps/plugins/lib/libprogen.py:1414
-#, fuzzy
 msgid "see address on "
-msgstr "Adreça _Web:"
+msgstr "vegeu l'adreça a "
 
 #: ../gramps/plugins/lib/libprogen.py:1417
-#, fuzzy
 msgid "see also address"
-msgstr "Adreça _Web:"
+msgstr "vegeu també l'adreça"
 
 #: ../gramps/plugins/lib/libprogen.py:1517
 msgid "Death cause"
@@ -28867,14 +28886,12 @@ msgid "Adding children."
 msgstr "Afegint fills."
 
 #: ../gramps/plugins/lib/libprogen.py:1929
-#, fuzzy
 msgid "Cannot find father for I%(person)s (Father=%(father))"
-msgstr "%(person)s (Pare=%(id)d)"
+msgstr "No es pot trobar el pare per a I%(person)s (pare=%(father))"
 
 #: ../gramps/plugins/lib/libprogen.py:1932
-#, fuzzy
 msgid "Cannot find mother for I%(person)s (Mother=%(mother))"
-msgstr "%(person)s (Mare=%(mother)d)"
+msgstr "No es pot trobar la mare per a I%(person)s (mare=%(mother))"
 
 #: ../gramps/plugins/lib/librecords.py:55
 msgid "Youngest living person"
@@ -29134,13 +29151,42 @@ msgstr "El mapa"
 msgid "Select tile cache directory for offline mode"
 msgstr "Selecciona el directori cau per les caselles per al mode fora de línia"
 
-#: ../gramps/plugins/lib/maps/osmgps.py:138
+#: ../gramps/plugins/lib/maps/osmgps.py:139
 #, python-format
 msgid "Can't create tiles cache directory %s"
 msgstr "No s'ha pogut crear el directori de reserva de caselles %s"
 
-#: ../gramps/plugins/lib/maps/osmgps.py:161
+#: ../gramps/plugins/lib/maps/osmgps.py:143
-#: ../gramps/plugins/lib/maps/osmgps.py:226
+#, python-format
+msgid ""
+"You must verify and change the tiles cache\n"
+"...\n"
+"[geography]\n"
+"...\n"
+"path='bad/path'\n"
+"...\n"
+"in the gramps.ini file :\n"
+"%s\n"
+"\n"
+"Before to change the gramps.ini file, you need to close gramps\n"
+"\n"
+"The next errors will be normal"
+msgstr ""
+"Heu de verificar i modificar la reserva de caselles\n"
+"...\n"
+"[geography\n"
+"...\n"
+"path='camí/incorrecte'\n"
+"...\n"
+"al fitxer gramps.ini:\n"
+"%s\n"
+"\n"
+"Abans de canviar el fitxer gramps.ini, heu de tancar Gramps\n"
+"\n"
+"Els següents errors seran normals"
+
+#: ../gramps/plugins/lib/maps/osmgps.py:174
+#: ../gramps/plugins/lib/maps/osmgps.py:239
 #, python-format
 msgid "Can't create tiles cache directory for '%s'."
 msgstr "No s'ha pogut crear el directori de reserva de caselles per a '%s'."
@@ -29164,12 +29210,17 @@ msgid ""
 "In the following table you may have :\n"
 " - a green row related to a selected place."
 msgstr ""
+"\n"
+"A la següent taula podeu tenir:\n"
+"- una fila verda relacionada amb un lloc seleccionat."
 
 #: ../gramps/plugins/lib/maps/placeselection.py:128
 msgid ""
 "\n"
 " - a red row related to a geocoding result."
 msgstr ""
+"\n"
+"- una fila vermella relacionada amb un resultat de geocodificació."
 
 #: ../gramps/plugins/lib/maps/placeselection.py:165
 msgid "The green values in the row correspond to the current place values."
@@ -33010,6 +33061,9 @@ msgid ""
 "in coordinates fields.\n"
 "Double click on a row to edit its content."
 msgstr ""
+"Cercar espais al principi i/o al final per a persones i llocs. Cercar comes "
+"en camps de coordenades.\n"
+"Feu doble clic en una fila per editar-ne el contingut."
 
 #: ../gramps/plugins/tool/removespaces.py:113
 msgid "Looking for possible fields with leading or trailing spaces"
@@ -33023,9 +33077,8 @@ msgstr "Sobrenom"
 
 #. 2=double underline
 #: ../gramps/plugins/tool/removespaces.py:135
-#, fuzzy
 msgid "firstname"
-msgstr "nom desconegut"
+msgstr ""
 
 #. 2=double underline
 #: ../gramps/plugins/tool/removespaces.py:143
@@ -33777,19 +33830,16 @@ msgid "Old age but no death"
 msgstr "Edat avançada però no hi ha defunció"
 
 #: ../gramps/plugins/tool/verify.py:1802
-#, fuzzy
 msgid "Birth equals death"
-msgstr "Data de naixement"
+msgstr "Data de naixement igual a data de defunció"
 
 #: ../gramps/plugins/tool/verify.py:1820
-#, fuzzy
 msgid "Birth equals marriage"
-msgstr "Menys temps després del casament"
+msgstr "Data de naixement igual a data de casament"
 
 #: ../gramps/plugins/tool/verify.py:1838
-#, fuzzy
 msgid "Death equals marriage"
-msgstr "Casament tardà"
+msgstr "Data de defunció igual a data de casament"
 
 #: ../gramps/plugins/view/citationlistview.py:105
 msgid "Source: Title"
@@ -33951,14 +34001,13 @@ msgid "Merge the selected events"
 msgstr "Combinar els esdeveniments seleccionats"
 
 #: ../gramps/plugins/view/eventview.py:385
-#, fuzzy
 msgid "_Delete Event"
-msgstr "Esborrar Esdeveniment (%s)"
+msgstr "_Esborrar Esdeveniment"
 
 #: ../gramps/plugins/view/eventview.py:400
 #, python-brace-format
 msgid "Delete {type} [{gid}]?"
-msgstr ""
+msgstr "Esborrar {type} [{gid}]?"
 
 #: ../gramps/plugins/view/eventview.py:443
 msgid "Cannot merge event objects."
@@ -34284,15 +34333,14 @@ msgid "Selecting all events"
 msgstr "Seleccionant tots els esdeveniments"
 
 #: ../gramps/plugins/view/geoevents.py:368
-#, fuzzy
 msgid ""
 "Right click on the map and select 'show all events' to show all known events "
 "with coordinates. You can use the history to navigate on the map. You can "
 "use filtering."
 msgstr ""
-"Clic dret al mapa i selecciona 'mostra tots els llocs' per mostrar tots els "
+"Feu clic dret al mapa i seleccioneu 'mostrar tots els esdeveniments' per "
-"llocs coneguts amb coordenades. Pots canviar el color dels marcadors "
+"mostrar tots els esdeveniments coneguts amb coordenades. Podeu utilitzar la "
-"depenent del tipus de lloc. Pots utilitzar el filtrat."
+"història per navegar pel mapa. Podeu utilitzar el filtrat."
 
 #: ../gramps/plugins/view/geoevents.py:408
 #: ../gramps/plugins/view/geoevents.py:440
@@ -34645,9 +34693,8 @@ msgid "Show all places"
 msgstr "Mostra tots els llocs"
 
 #: ../gramps/plugins/view/geoplaces.py:659
-#, fuzzy
 msgid "Custom places name"
-msgstr "Nom de Lloc Complet"
+msgstr "Nom de lloc personalitzat"
 
 #: ../gramps/plugins/view/geoplaces.py:668
 msgid "The places marker color"
@@ -35290,7 +35337,7 @@ msgstr "Ubicacions"
 
 #: ../gramps/plugins/webreport/basepage.py:2896
 msgid "circa"
-msgstr ""
+msgstr "circa"
 
 #: ../gramps/plugins/webreport/basepage.py:2898
 #, fuzzy
@@ -35632,11 +35679,11 @@ msgstr "Si s'ha d'incloure un graf d'avantpassats a cada pàgina individual"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1735
 msgid "Add previous/next"
-msgstr ""
+msgstr "Afegir previ/següent"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1736
 msgid "Add previous/next to the navigation bar."
-msgstr ""
+msgstr "Afegir previ/següent a la barra de navegació."
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1739
 msgid "This is a secure site (https)"
@@ -35647,26 +35694,24 @@ msgid "Whether to use http:// or https://"
 msgstr "Si utilitzar http:// o https://"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1748
-#, fuzzy
 msgid "Extra pages"
-msgstr "Extra gran"
+msgstr "Pàgines addicionals"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1751
-#, fuzzy
 msgid "Extra page name"
-msgstr "Extra gran"
+msgstr "Nom de pàgina addicional"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1754
 msgid "Your extra page name like it is shown in the menubar"
-msgstr ""
+msgstr "El nom de la vostra pàgina addicional tal com surt a la barra del menú"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1759
 msgid "Your extra page path"
-msgstr ""
+msgstr "El camí de la vostra pàgina addicional"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1762
 msgid "Your extra page path without extension"
-msgstr ""
+msgstr "El camí de la vostra pàgina addicional sense extensió"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1782
 msgid "Sort all children in birth order"
@@ -35680,19 +35725,21 @@ msgstr ""
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1788
 msgid "Do we display coordinates in the places list?"
-msgstr ""
+msgstr "Mostrem les coordenades a la llista de llocs?"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1790
 msgid "Whether to display latitude/longitude in the places list?"
-msgstr ""
+msgstr "Si s'ha de mostrar la latitud/longitud a la llista de llocs"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1794
 msgid "Sort places references either by date or by name"
-msgstr ""
+msgstr "Ordenar les referències de lloc bé per data o bé per nom"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1796
 msgid "Sort the places references by date or by name. Not set means by date."
 msgstr ""
+"Ordenar les referències de lloc per data o per nom. Si no diu res vol dir "
+"que es fa per data."
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1800
 msgid "Graph generations"
@@ -35704,13 +35751,15 @@ msgstr "El nombre de generacions a incloure al graf d'avantpassats"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1807
 msgid "Include narrative notes just after name, gender"
-msgstr ""
+msgstr "Incloure notes de narració després mateix del nom, gènere"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1809
 msgid ""
 "Include narrative notes just after name, gender and age at death (default) "
 "or include them just before attributes."
 msgstr ""
+"Incloure notes de narració després mateix del nom, gènere i edat de defunció "
+"(predeterminat) o incloure'ls abans mateix dels atributs."
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1818
 msgid "Page Generation"
@@ -35834,10 +35883,10 @@ msgstr "Amplada màxima d'imatge inicial"
 #: ../gramps/plugins/webreport/narrativeweb.py:1893
 msgid ""
 "This allows you to set the maximum width of the image shown on the media "
-"page. Set to 0 for no limit."
+"page."
 msgstr ""
-"Això li permet de fixar l'amplada màxima de la imatge que es mostra a la "
+"Això us permet de fixar l'amplada màxima de la imatge que es mostra a la "
-"pàgina d'audiovisuals. Deixar a 0 perquè no hi hagi límit."
+"pàgina d'audiovisuals."
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1898
 msgid "Max height of initial image"
@@ -36602,14 +36651,12 @@ msgid "Include anniversaries in the calendar"
 msgstr "Incloure aniversaris al calendari"
 
 #: ../gramps/plugins/webreport/webcal.py:1891
-#, fuzzy
 msgid "Include death dates"
-msgstr "Incloure dates"
+msgstr "Incloure dates de defunció´"
 
 #: ../gramps/plugins/webreport/webcal.py:1892
-#, fuzzy
 msgid "Include death anniversaries in the calendar"
-msgstr "Incloure aniversaris al calendari"
+msgstr "Incloure aniversaris de defunció al calendari"
 
 #: ../gramps/plugins/webreport/webcal.py:1895
 msgid "Link to Narrated Web Report"
@@ -36621,13 +36668,16 @@ msgstr "Si s'han d'enllaçar les dades cap a l'informe web o no"
 
 #: ../gramps/plugins/webreport/webcal.py:1902
 msgid "Show data only after year"
-msgstr ""
+msgstr "Mostrar les dades només després de l'any"
 
 #: ../gramps/plugins/webreport/webcal.py:1905
 msgid ""
 "Show data only after this year. Default is current year -  'maximum age "
 "probably alive' which is defined in the dates preference tab."
 msgstr ""
+"Mostrar les dades només després d'aquest any. Per defecte és l'any actual - "
+"'màxima edat probablement viu' que està definit a la pestanya de "
+"preferències de dates."
 
 #: ../gramps/plugins/webreport/webcal.py:1913
 msgid "Link prefix"
@@ -36645,12 +36695,11 @@ msgstr "%s"
 #: ../gramps/plugins/webreport/webcal.py:2103
 #, python-format
 msgid "%s since death"
-msgstr ""
+msgstr "%s des de la defunció"
 
 #: ../gramps/plugins/webreport/webcal.py:2104
-#, fuzzy
 msgid "death"
-msgstr "Defunció"
+msgstr "defunció"
 
 #: ../gramps/plugins/webreport/webcal.py:2111
 #, python-format

po/ru.po

@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gramps51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-26 08:03+0300\n"
+"POT-Creation-Date: 2020-06-03 10:22+0300\n"
-"PO-Revision-Date: 2020-03-26 16:45+0300\n"
+"PO-Revision-Date: 2020-06-03 10:23+0300\n"
 "Last-Translator: Ivan Komaritsyn <vantu5z@mail.ru>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -2167,13 +2167,13 @@ msgstr "неизвестно"
 msgid ":"
 msgstr ":"
 
-#: ../gramps/gen/datehandler/__init__.py:83
+#: ../gramps/gen/datehandler/__init__.py:88
 #, python-format
 msgid "Date parser for '%s' not available, using default"
 msgstr ""
 "Обработчик дат для '%s' недоступен, используется обработчик по умолчанию"
 
-#: ../gramps/gen/datehandler/__init__.py:100
+#: ../gramps/gen/datehandler/__init__.py:105
 #, python-format
 msgid "Date displayer for '%s' not available, using default"
 msgstr ""
@@ -3015,7 +3015,7 @@ msgstr ""
 "которая распознаёт форматы версии от %(min_vers)s до %(max_vers)s.\n"
 "\n"
 "Пожалуйста, обновите GRAMPS или используйте XML формат для переноса данных\n"
-"между различными версиями баз данных."
+"между различными версиями программы."
 
 #: ../gramps/gen/db/exceptions.py:114
 #, python-format
@@ -4508,7 +4508,7 @@ msgstr "Семейное событие:"
 #: ../gramps/gen/filters/rules/family/_hasevent.py:51
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:83
 #: ../gramps/gui/selectors/selectevent.py:67
-#: ../gramps/plugins/gramplet/events.py:92
+#: ../gramps/plugins/gramplet/events.py:93
 #: ../gramps/plugins/view/eventview.py:86
 msgid "Main Participants"
 msgstr "Главные участники"
@@ -4830,7 +4830,7 @@ msgstr "Тип:"
 
 #: ../gramps/gen/filters/rules/media/_hasmedia.py:48
 #: ../gramps/gui/glade/mergemedia.glade:245
-#: ../gramps/gui/glade/mergemedia.glade:261 ../gramps/gui/viewmanager.py:1663
+#: ../gramps/gui/glade/mergemedia.glade:261 ../gramps/gui/viewmanager.py:1660
 msgid "Path:"
 msgstr "Путь:"
 
@@ -5343,11 +5343,11 @@ msgstr "Источник фамилии:"
 
 #: ../gramps/gen/filters/rules/person/_hasnameorigintype.py:47
 msgid "People with the <Surname origin type>"
-msgstr "Лица с <имяобразованием>"
+msgstr "Лица с <происхождением фамилии>"
 
 #: ../gramps/gen/filters/rules/person/_hasnameorigintype.py:48
 msgid "Matches people with a surname origin"
-msgstr "Выбирает лиц с указанным имяобразованием фамилии"
+msgstr "Выбирает лиц с указанным типом происхождения фамилии"
 
 #: ../gramps/gen/filters/rules/person/_hasnametype.py:46
 #: ../gramps/gui/editors/filtereditor.py:111
@@ -6652,7 +6652,7 @@ msgstr "Заметки"
 #: ../gramps/plugins/export/exportcsv.py:466
 #: ../gramps/plugins/gramplet/ageondategramplet.py:66
 #: ../gramps/plugins/gramplet/coordinates.py:91
-#: ../gramps/plugins/gramplet/events.py:87
+#: ../gramps/plugins/gramplet/events.py:88
 #: ../gramps/plugins/gramplet/locations.py:87
 #: ../gramps/plugins/gramplet/personresidence.py:60
 #: ../gramps/plugins/importer/importcsv.py:236
@@ -6823,7 +6823,7 @@ msgstr "Каста"
 #: ../gramps/gui/plug/_windows.py:622 ../gramps/gui/plug/_windows.py:1107
 #: ../gramps/gui/selectors/selectevent.py:70
 #: ../gramps/plugins/gramplet/coordinates.py:90
-#: ../gramps/plugins/gramplet/events.py:86
+#: ../gramps/plugins/gramplet/events.py:87
 #: ../gramps/plugins/lib/libmetadata.py:100
 #: ../gramps/plugins/textreport/placereport.py:226
 #: ../gramps/plugins/textreport/placereport.py:303
@@ -6872,7 +6872,7 @@ msgstr "Агентство"
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:88
 #: ../gramps/plugins/drawreport/statisticschart.py:377
 #: ../gramps/plugins/gramplet/agestats.py:176
-#: ../gramps/plugins/gramplet/events.py:89
+#: ../gramps/plugins/gramplet/events.py:90
 #: ../gramps/plugins/quickview/ageondate.py:54
 msgid "Age"
 msgstr "Возраст"
@@ -7245,7 +7245,7 @@ msgid "Values"
 msgstr "Значения"
 
 #: ../gramps/gen/lib/date.py:719 ../gramps/gen/lib/placename.py:99
-#: ../gramps/gen/lib/styledtext.py:321
+#: ../gramps/gen/lib/styledtext.py:322
 #: ../gramps/gen/plug/report/_constants.py:54 ../gramps/gui/clipboard.py:613
 #: ../gramps/gui/clipboard.py:621 ../gramps/gui/configure.py:1396
 #: ../gramps/gui/filters/sidebar/_notesidebarfilter.py:101
@@ -7344,7 +7344,7 @@ msgstr "Событие"
 #: ../gramps/plugins/export/exportcsv.py:286
 #: ../gramps/plugins/export/exportcsv.py:466
 #: ../gramps/plugins/gramplet/coordinates.py:93
-#: ../gramps/plugins/gramplet/events.py:91
+#: ../gramps/plugins/gramplet/events.py:92
 #: ../gramps/plugins/gramplet/personresidence.py:61
 #: ../gramps/plugins/gramplet/quickviewgramplet.py:113
 #: ../gramps/plugins/importer/importcsv.py:237
@@ -7992,7 +7992,7 @@ msgstr "Гражданский союз"
 #: ../gramps/plugins/export/exportcsv.py:287
 #: ../gramps/plugins/gramplet/backlinks.py:55
 #: ../gramps/plugins/gramplet/coordinates.py:89
-#: ../gramps/plugins/gramplet/events.py:85
+#: ../gramps/plugins/gramplet/events.py:86
 #: ../gramps/plugins/gramplet/locations.py:86
 #: ../gramps/plugins/gramplet/placedetails.py:126
 #: ../gramps/plugins/importer/importcsv.py:240
@@ -8228,7 +8228,7 @@ msgstr "Регион"
 #: ../gramps/plugins/tool/dumpgenderstats.py:95
 #: ../gramps/plugins/tool/dumpgenderstats.py:99
 #: ../gramps/plugins/tool/notrelated.py:126
-#: ../gramps/plugins/tool/removeunused.py:201
+#: ../gramps/plugins/tool/removeunused.py:205
 #: ../gramps/plugins/tool/verify.py:579 ../gramps/plugins/view/repoview.py:85
 #: ../gramps/plugins/webreport/basepage.py:397
 #: ../gramps/plugins/webreport/person.py:1868
@@ -8358,7 +8358,7 @@ msgstr "Отчество"
 
 #: ../gramps/gen/lib/nameorigintype.py:80
 msgid "Matronymic"
-msgstr "Матчество"
+msgstr "Матроним"
 
 #: ../gramps/gen/lib/nameorigintype.py:81
 msgid "Surname|Feudal"
@@ -8760,7 +8760,7 @@ msgstr "Округ/Край"
 
 #: ../gramps/gen/lib/placetype.py:77 ../gramps/plugins/view/geoplaces.py:607
 msgid "Borough"
-msgstr "Район"
+msgstr "Район (города)"
 
 #: ../gramps/gen/lib/placetype.py:78 ../gramps/plugins/view/geoplaces.py:655
 msgid "Municipality"
@@ -8942,11 +8942,11 @@ msgstr "Надгробный камень"
 msgid "Video"
 msgstr "Видео"
 
-#: ../gramps/gen/lib/styledtext.py:317
+#: ../gramps/gen/lib/styledtext.py:318
 msgid "Styled Text"
 msgstr "Стилизованный текст"
 
-#: ../gramps/gen/lib/styledtext.py:324
+#: ../gramps/gen/lib/styledtext.py:325
 msgid "Styled Text Tags"
 msgstr "Стилизованные теги текста"
 
@@ -9931,12 +9931,12 @@ msgstr "PDF"
 msgid "LaTeX File"
 msgstr "Файл LaTeX"
 
-#: ../gramps/gen/plug/menu/_enumeratedlist.py:142
+#: ../gramps/gen/plug/menu/_enumeratedlist.py:145
 #, python-format
 msgid "Value '%(val)s' not found for option '%(opt)s'"
 msgstr "Значение «%(val)s» не найдено для параметра «%(opt)s»"
 
-#: ../gramps/gen/plug/menu/_enumeratedlist.py:144
+#: ../gramps/gen/plug/menu/_enumeratedlist.py:147
 #: ../gramps/gen/plug/report/stdoptions.py:283
 msgid "Valid values: "
 msgstr "Допустимые значения: "
@@ -10158,7 +10158,7 @@ msgstr "Как и где включать номера-идентификато
 #. #########################
 #. ###############################
 #: ../gramps/gen/plug/report/stdoptions.py:328
-#: ../gramps/gui/viewmanager.py:1722
+#: ../gramps/gui/viewmanager.py:1719
 #: ../gramps/plugins/graph/gvfamilylines.py:219
 #: ../gramps/plugins/graph/gvrelgraph.py:862
 #: ../gramps/plugins/textreport/detancestralreport.py:900
@@ -11362,7 +11362,7 @@ msgstr "Перетаскивайте столбцы с помощью мыши,
 
 #: ../gramps/gui/columnorder.py:107 ../gramps/gui/configure.py:1835
 #: ../gramps/gui/configure.py:1859 ../gramps/gui/configure.py:1885
-#: ../gramps/gui/plug/_dialogs.py:130 ../gramps/gui/viewmanager.py:1794
+#: ../gramps/gui/plug/_dialogs.py:130 ../gramps/gui/viewmanager.py:1791
 #: ../gramps/plugins/lib/maps/geography.py:997
 #: ../gramps/plugins/lib/maps/geography.py:1294
 msgid "_Apply"
@@ -11410,7 +11410,7 @@ msgstr "Показать «Редактор имён»"
 #: ../gramps/gui/plug/_windows.py:105 ../gramps/gui/plug/_windows.py:693
 #: ../gramps/gui/plug/_windows.py:749
 #: ../gramps/gui/plug/quick/_textbufdoc.py:60 ../gramps/gui/undohistory.py:90
-#: ../gramps/gui/viewmanager.py:1657 ../gramps/gui/views/bookmarks.py:298
+#: ../gramps/gui/viewmanager.py:1654 ../gramps/gui/views/bookmarks.py:298
 #: ../gramps/gui/views/tags.py:466 ../gramps/gui/widgets/grampletbar.py:637
 #: ../gramps/gui/widgets/grampletpane.py:240
 #: ../gramps/plugins/lib/maps/placeselection.py:120
@@ -11461,11 +11461,11 @@ msgstr ""
 "  <b>Главное, Главное[пр], или …[фам] …[св]</b> - полностью главная фамилия, "
 "префикс, только фамилия, связка\n"
 "  <b>Отчество, Отчество[пр], или …[им] …[св]</b> - аналогично Главное… для "
-"отчества или матчества\n"
+"отчества или матронима\n"
 "  <b>Семпрозвище</b> - семейное прозвище            <b>Неглавные</b>   - "
 "фамилии без главной+отчества\n"
 "  <b>Префикс</b>     - приставки («де», «ван», ...) <b>Безотчества</b> - "
-"фамилии без отчества/матчества\n"
+"фамилии без отчества/матронима\n"
 "  <b>Списокфо</b>    - фамилии и отчества (без префиксов и связок)\n"
 "</tt>\n"
 "Укажите ключевое слово ЗАГЛАВНЫМИ БУКВАМИ, чтобы соответствующие данные\n"
@@ -11827,7 +11827,7 @@ msgstr "Редактировать"
 
 #: ../gramps/gui/configure.py:1208
 msgid "Consider single pa/matronymic as surname"
-msgstr "Использовать одиночное отчество/матчество как фамилию"
+msgstr "Использовать одиночное отчество/матроним как фамилию"
 
 #: ../gramps/gui/configure.py:1240
 msgid "Place format (auto place title)"
@@ -11863,7 +11863,7 @@ msgstr "Угадывание фамилий"
 
 #: ../gramps/gui/configure.py:1308
 msgid "Default family relationship"
-msgstr "Межличностное отношение по умолчанию"
+msgstr "Семейное отношение по умолчанию"
 
 #: ../gramps/gui/configure.py:1315
 msgid "Height multiple surname box (pixels)"
@@ -12269,7 +12269,7 @@ msgstr "Выбрать каталог документов"
 #: ../gramps/gui/plug/_guioptions.py:1744 ../gramps/gui/plug/_windows.py:440
 #: ../gramps/gui/plug/report/_fileentry.py:64
 #: ../gramps/gui/plug/report/_reportdialog.py:162 ../gramps/gui/utils.py:180
-#: ../gramps/gui/viewmanager.py:1792 ../gramps/gui/views/listview.py:1065
+#: ../gramps/gui/viewmanager.py:1789 ../gramps/gui/views/listview.py:1065
 #: ../gramps/gui/views/navigationview.py:348 ../gramps/gui/views/tags.py:682
 #: ../gramps/gui/widgets/progressdialog.py:437
 #: ../gramps/plugins/importer/importprogen.glade:1714
@@ -12285,7 +12285,7 @@ msgstr "_Отменить"
 msgid "Select database directory"
 msgstr "Выбрать каталог базы данных"
 
-#: ../gramps/gui/configure.py:1880 ../gramps/gui/viewmanager.py:1789
+#: ../gramps/gui/configure.py:1880 ../gramps/gui/viewmanager.py:1786
 msgid "Select backup directory"
 msgstr "Выберите каталог для резервного копирования"
 
@@ -12579,7 +12579,7 @@ msgstr "Информация о базе данных"
 #: ../gramps/gui/glade/styleeditor.glade:1754
 #: ../gramps/gui/plug/_guioptions.py:80
 #: ../gramps/gui/plug/report/_reportdialog.py:166 ../gramps/gui/utils.py:194
-#: ../gramps/gui/viewmanager.py:1659 ../gramps/gui/views/tags.py:683
+#: ../gramps/gui/viewmanager.py:1656 ../gramps/gui/views/tags.py:683
 #: ../gramps/plugins/tool/check.py:781 ../gramps/plugins/tool/patchnames.py:118
 #: ../gramps/plugins/tool/populatesources.py:91
 #: ../gramps/plugins/tool/testcasegenerator.py:328
@@ -13070,7 +13070,7 @@ msgstr "Атрибуты"
 #: ../gramps/plugins/tool/eventcmp.py:253
 #: ../gramps/plugins/tool/notrelated.py:127
 #: ../gramps/plugins/tool/patchnames.py:404
-#: ../gramps/plugins/tool/removeunused.py:195
+#: ../gramps/plugins/tool/removeunused.py:199
 #: ../gramps/plugins/tool/sortevents.py:56 ../gramps/plugins/tool/verify.py:572
 #: ../gramps/plugins/view/citationlistview.py:99
 #: ../gramps/plugins/view/citationtreeview.py:94
@@ -13233,7 +13233,7 @@ msgid "Move the selected event downwards"
 msgstr "Переместить выделенное событие ниже"
 
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:82
-#: ../gramps/plugins/gramplet/events.py:93
+#: ../gramps/plugins/gramplet/events.py:94
 msgid "Role"
 msgstr "Роль"
 
@@ -13391,14 +13391,14 @@ msgstr "Сделать базовым именем"
 #.
 #. -------------------------------------------------------------------------
 #: ../gramps/gui/editors/displaytabs/namemodel.py:56
-#: ../gramps/gui/plug/_guioptions.py:1258 ../gramps/gui/viewmanager.py:1025
+#: ../gramps/gui/plug/_guioptions.py:1258 ../gramps/gui/viewmanager.py:1022
 #: ../gramps/gui/views/tags.py:532
 #: ../gramps/plugins/quickview/all_relations.py:306
 msgid "Yes"
 msgstr "Да"
 
 #: ../gramps/gui/editors/displaytabs/namemodel.py:57
-#: ../gramps/gui/plug/_guioptions.py:1257 ../gramps/gui/viewmanager.py:1025
+#: ../gramps/gui/plug/_guioptions.py:1257 ../gramps/gui/viewmanager.py:1022
 #: ../gramps/gui/views/tags.py:533
 #: ../gramps/plugins/quickview/all_relations.py:310
 msgid "No"
@@ -13624,7 +13624,7 @@ msgstr "Переместить выделенную фамилию ниже"
 #: ../gramps/gui/editors/displaytabs/surnametab.py:81
 #: ../gramps/plugins/lib/libgedcom.py:712
 msgid "Origin"
-msgstr "Имяобразование"
+msgstr "Происхождение"
 
 #: ../gramps/gui/editors/displaytabs/surnametab.py:85
 msgid "Multiple Surnames"
@@ -13870,7 +13870,7 @@ msgstr "Сохранение события невозможно. ID уже су
 
 #: ../gramps/gui/editors/editevent.py:264
 msgid "The event type cannot be empty"
-msgstr "Событие не может быть безымянным"
+msgstr "Необходимо указать тип события"
 
 #: ../gramps/gui/editors/editevent.py:270
 #, python-format
@@ -16219,7 +16219,7 @@ msgstr "Общая информация"
 msgid ""
 "An identification of what type of Name this is, eg. Birth Name, Married Name."
 msgstr ""
-"Какой это тип имени. Например, фамилия при рождении или фамилия в браке."
+"Определяет какой это тип имени. Например, имя при рождении или в браке."
 
 #: ../gramps/gui/glade/editname.glade:192
 #: ../gramps/gui/glade/editperson.glade:134
@@ -16275,11 +16275,14 @@ msgstr "Необязательный суффикс фамилии, наприм
 msgid ""
 "A descriptive name given in place of or in addition to the official given "
 "name."
-msgstr "Имя-описание, данное вместо, либо вдобавок, к официальному имени."
+msgstr ""
+"Имя которое иногда дается человеку (помимо настоящей фамилии и имени) и как "
+"правило указывает на какую-нибудь черту его характера, внешности, "
+"деятельности, привычек."
 
 #: ../gramps/gui/glade/editname.glade:333
 msgid "Given Name(s) "
-msgstr "Имя(-на) "
+msgstr "Имя "
 
 #: ../gramps/gui/glade/editname.glade:384
 msgid "_Family Nick Name:"
@@ -16453,7 +16456,7 @@ msgstr "Происхождение:"
 msgid ""
 "The origin of this family name for this family, eg 'Inherited' or "
 "'Patronymic'."
-msgstr "Происхождение фамилии, например 'принятая' или 'унаследованая'."
+msgstr "Происхождение фамилии, например 'принятая' или 'унаследованная'."
 
 #: ../gramps/gui/glade/editperson.glade:585
 msgid "G_ender:"
@@ -18791,7 +18794,7 @@ msgstr "Использовать сжатие"
 
 #: ../gramps/gui/plug/quick/_quickreports.py:98
 msgid "Web Connection"
-msgstr "Веб соединение"
+msgstr "Поиск по веб-сайтам"
 
 #: ../gramps/gui/plug/quick/_quickreports.py:144
 #: ../gramps/gui/plug/quick/_textbufdoc.py:74
@@ -19365,11 +19368,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../gramps/gui/undohistory.py:84 ../gramps/gui/viewmanager.py:1120
+#: ../gramps/gui/undohistory.py:84 ../gramps/gui/viewmanager.py:1117
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: ../gramps/gui/undohistory.py:86 ../gramps/gui/viewmanager.py:1140
+#: ../gramps/gui/undohistory.py:86 ../gramps/gui/viewmanager.py:1137
 msgid "_Redo"
 msgstr "Ве_рнуть"
 
@@ -19449,7 +19452,7 @@ msgstr ""
 msgid "Cannot open new citation editor"
 msgstr "Не удалось открыть новый редактор цитат"
 
-#: ../gramps/gui/viewmanager.py:331 ../gramps/gui/viewmanager.py:1052
+#: ../gramps/gui/viewmanager.py:331 ../gramps/gui/viewmanager.py:1049
 msgid "No Family Tree"
 msgstr "Нет семейного древа"
 
@@ -19494,36 +19497,36 @@ msgid "View failed to load. Check error output."
 msgstr "Не удалось загрузить вид. Проверьте сообщения об ошибках."
 
 # statistics over import results
-#: ../gramps/gui/viewmanager.py:948
+#: ../gramps/gui/viewmanager.py:945
 #: ../gramps/plugins/importer/importprogen.py:195
 msgid "Import Statistics"
 msgstr "Статистика импорта"
 
-#: ../gramps/gui/viewmanager.py:1019
+#: ../gramps/gui/viewmanager.py:1016
 msgid "Read Only"
 msgstr "Только чтение"
 
-#: ../gramps/gui/viewmanager.py:1023
+#: ../gramps/gui/viewmanager.py:1020
 msgid "Gramps had a problem the last time it was run."
 msgstr "Возникла проблема при прошлом запуске Gramps."
 
-#: ../gramps/gui/viewmanager.py:1024
+#: ../gramps/gui/viewmanager.py:1021
 msgid "Would you like to run the Check and Repair tool?"
 msgstr "Хотите запустить инструмент «Проверка и исправление»?"
 
-#: ../gramps/gui/viewmanager.py:1189
+#: ../gramps/gui/viewmanager.py:1186
 msgid "Autobackup..."
 msgstr "Автоматическое резервное копирование..."
 
-#: ../gramps/gui/viewmanager.py:1194
+#: ../gramps/gui/viewmanager.py:1191
 msgid "Error saving backup data"
 msgstr "Ошибка сохранения резервной копии"
 
-#: ../gramps/gui/viewmanager.py:1481
+#: ../gramps/gui/viewmanager.py:1478
 msgid "Failed Loading View"
 msgstr "Не удалось загрузить вид"
 
-#: ../gramps/gui/viewmanager.py:1482
+#: ../gramps/gui/viewmanager.py:1479
 #, python-format
 msgid ""
 "The view %(name)s did not load and reported an error.\n"
@@ -19548,11 +19551,11 @@ msgstr ""
 "Если не хотите, чтобы Gramps пыталась загрузить этот вид в следующий раз, "
 "спрячьте его, с помощью «Справка / Менеджер дополнений»."
 
-#: ../gramps/gui/viewmanager.py:1574
+#: ../gramps/gui/viewmanager.py:1571
 msgid "Failed Loading Plugin"
 msgstr "Ошибка загрузки модуля"
 
-#: ../gramps/gui/viewmanager.py:1575
+#: ../gramps/gui/viewmanager.py:1572
 #, python-format
 msgid ""
 "The plugin %(name)s did not load and reported an error.\n"
@@ -19577,55 +19580,55 @@ msgstr ""
 "Если не хотите, чтобы Gramps пыталась загрузить этот модуль в следующий раз, "
 "спрячьте его, с помощью «Справка / Менеджер дополнений»."
 
-#: ../gramps/gui/viewmanager.py:1655
+#: ../gramps/gui/viewmanager.py:1652
 msgid "Gramps XML Backup"
 msgstr "Резервная копия Gramps в XML"
 
-#: ../gramps/gui/viewmanager.py:1684
+#: ../gramps/gui/viewmanager.py:1681
 msgid "File:"
 msgstr "Файл:"
 
-#: ../gramps/gui/viewmanager.py:1716
+#: ../gramps/gui/viewmanager.py:1713
 msgid "Media:"
 msgstr "Альбом:"
 
-#: ../gramps/gui/viewmanager.py:1723
+#: ../gramps/gui/viewmanager.py:1720
 #: ../gramps/plugins/gramplet/statsgramplet.py:196
 #: ../gramps/plugins/webreport/statistics.py:145
 msgid "Megabyte|MB"
 msgstr "Мб"
 
-#: ../gramps/gui/viewmanager.py:1725
+#: ../gramps/gui/viewmanager.py:1722
 msgid "Exclude"
 msgstr "Исключить"
 
-#: ../gramps/gui/viewmanager.py:1745
+#: ../gramps/gui/viewmanager.py:1742
 msgid "Backup file already exists! Overwrite?"
 msgstr "Файл с резервной копией уже существует! Перезаписать?"
 
-#: ../gramps/gui/viewmanager.py:1746
+#: ../gramps/gui/viewmanager.py:1743
 #, python-format
 msgid "The file '%s' exists."
 msgstr "Файл «%s» уже существует."
 
-#: ../gramps/gui/viewmanager.py:1747
+#: ../gramps/gui/viewmanager.py:1744
 msgid "Proceed and overwrite"
 msgstr "Продолжить и перезаписать"
 
-#: ../gramps/gui/viewmanager.py:1748
+#: ../gramps/gui/viewmanager.py:1745
 msgid "Cancel the backup"
 msgstr "Отменить резервное копирование"
 
-#: ../gramps/gui/viewmanager.py:1763
+#: ../gramps/gui/viewmanager.py:1760
 msgid "Making backup..."
 msgstr "Создание резервной копии..."
 
-#: ../gramps/gui/viewmanager.py:1776
+#: ../gramps/gui/viewmanager.py:1773
 #, python-format
 msgid "Backup saved to '%s'"
 msgstr "Резервная копия сохранена в '%s'"
 
-#: ../gramps/gui/viewmanager.py:1779
+#: ../gramps/gui/viewmanager.py:1776
 msgid "Backup aborted"
 msgstr "Резервное копирование прервано"
 
@@ -21959,7 +21962,7 @@ msgid "Sorted by %s"
 msgstr "Отсортировано по %s"
 
 #: ../gramps/plugins/drawreport/timeline.py:312
-#: ../gramps/plugins/lib/libgedcom.py:7901
+#: ../gramps/plugins/lib/libgedcom.py:7902
 msgid "No Date Information"
 msgstr "Нет данных о дате"
 
@@ -22474,7 +22477,7 @@ msgstr "Ошибки"
 msgid "Apply"
 msgstr "Применить"
 
-#: ../gramps/plugins/gramplet/events.py:81
+#: ../gramps/plugins/gramplet/events.py:82
 #: ../gramps/plugins/gramplet/personresidence.py:56
 msgid "Double-click on a row to edit the selected event."
 msgstr "Щёлкните на строке дважды для правки выбранного события."
@@ -22613,7 +22616,7 @@ msgstr ""
 #, python-format
 msgid " 11. %(web_html_start)sHow do I record one's occupation?%(html_end)s\n"
 msgstr ""
-" 11. %(web_html_start)sКак ввести данные о роде деятельности?%(html_end)s\n"
+" 11. %(web_html_start)sКак ввести данные о виде деятельности?%(html_end)s\n"
 
 #: ../gramps/plugins/gramplet/faqgramplet.py:154
 #, python-format
@@ -24573,7 +24576,7 @@ msgstr "Стиль графа"
 
 #: ../gramps/plugins/graph/gvhourglass.py:438
 msgid "Force Ahnentafel order"
-msgstr "Принудительная сортировка по древу"
+msgstr "Принудительная сортировка по поколениям"
 
 #: ../gramps/plugins/graph/gvhourglass.py:440
 msgid ""
@@ -24699,19 +24702,19 @@ msgstr "Размещение изображения"
 #. occupation = BooleanOption(_("Include occupation"), False)
 #: ../gramps/plugins/graph/gvrelgraph.py:921
 msgid "Include occupation"
-msgstr "Включить данные о деятельности"
+msgstr "Включить данные о виде деятельности"
 
 #: ../gramps/plugins/graph/gvrelgraph.py:922
 msgid "Do not include any occupation"
-msgstr "Не включать данные о деятельности"
+msgstr "Не включать данные о видах деятельности"
 
 #: ../gramps/plugins/graph/gvrelgraph.py:923
 msgid "Include description of most recent occupation"
-msgstr "Включать описание деятельности"
+msgstr "Включить описание последнего вида деятельности"
 
 #: ../gramps/plugins/graph/gvrelgraph.py:925
 msgid "Include date, description and place of all occupations"
-msgstr "Включать даты, описания и места всех видов деятельности"
+msgstr "Включить даты, описания и места всех видов деятельности"
 
 #: ../gramps/plugins/graph/gvrelgraph.py:927
 msgid "Whether to include the last occupation"
@@ -24719,7 +24722,7 @@ msgstr "Включать ли последний вид деятельности
 
 #: ../gramps/plugins/graph/gvrelgraph.py:931
 msgid "Include relationship debugging numbers also"
-msgstr "Включать также отладочные числа отношений"
+msgstr "Включить также отладочные числа отношений"
 
 #: ../gramps/plugins/graph/gvrelgraph.py:934
 msgid ""
@@ -24920,7 +24923,7 @@ msgstr "лицо"
 
 #: ../gramps/plugins/importer/importcsv.py:210
 msgid "Occupation description"
-msgstr ""
+msgstr "Описание вида деятельности"
 
 #: ../gramps/plugins/importer/importcsv.py:210
 msgid "occupationdescr"
@@ -24928,7 +24931,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:211
 msgid "Occupation date"
-msgstr ""
+msgstr "Дата деятельности"
 
 #: ../gramps/plugins/importer/importcsv.py:211
 msgid "occupationdate"
@@ -24936,7 +24939,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:212
 msgid "Occupation place"
-msgstr ""
+msgstr "Место деятельности"
 
 #: ../gramps/plugins/importer/importcsv.py:212
 msgid "occupationplace"
@@ -24944,7 +24947,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:213
 msgid "Occupation place id"
-msgstr ""
+msgstr "ID места деятельности"
 
 #: ../gramps/plugins/importer/importcsv.py:213
 msgid "occupationplace_id"
@@ -24952,7 +24955,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:214
 msgid "Occupation source"
-msgstr ""
+msgstr "Источник вида деятельности"
 
 #: ../gramps/plugins/importer/importcsv.py:214
 msgid "occupationsource"
@@ -24960,7 +24963,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:216
 msgid "residence date"
-msgstr ""
+msgstr "дата проживания"
 
 #: ../gramps/plugins/importer/importcsv.py:216
 msgid "residencedate"
@@ -24968,7 +24971,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:217
 msgid "residence place"
-msgstr ""
+msgstr "место жительства"
 
 #: ../gramps/plugins/importer/importcsv.py:217
 msgid "residenceplace"
@@ -24976,7 +24979,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:218
 msgid "residence place id"
-msgstr ""
+msgstr "id места жительства"
 
 #: ../gramps/plugins/importer/importcsv.py:218
 msgid "residenceplace_id"
@@ -24984,7 +24987,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:219
 msgid "residence source"
-msgstr ""
+msgstr "источник проживания"
 
 #: ../gramps/plugins/importer/importcsv.py:219
 msgid "residencesource"
@@ -24992,7 +24995,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:221
 msgid "attribute type"
-msgstr ""
+msgstr "тип атрибута"
 
 #: ../gramps/plugins/importer/importcsv.py:221
 msgid "attributetype"
@@ -25000,7 +25003,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:222
 msgid "attribute value"
-msgstr ""
+msgstr "значение атрибута"
 
 #: ../gramps/plugins/importer/importcsv.py:222
 msgid "attributevalue"
@@ -25008,7 +25011,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:223
 msgid "attribute source"
-msgstr ""
+msgstr "источник атрибута"
 
 #: ../gramps/plugins/importer/importcsv.py:223
 msgid "attributesource"
@@ -25224,7 +25227,7 @@ msgstr "Болезнь"
 
 #: ../gramps/plugins/importer/importgeneweb.py:109
 msgid "List Passenger"
-msgstr "Список рассажиров"
+msgstr "Список пассажиров"
 
 #: ../gramps/plugins/importer/importgeneweb.py:110
 msgid "Military Distinction"
@@ -26072,7 +26075,7 @@ msgstr "Причина смерти"
 
 #: ../gramps/plugins/lib/libgedcom.py:702
 msgid "Employment"
-msgstr "Деятельность"
+msgstr "Место работы"
 
 #: ../gramps/plugins/lib/libgedcom.py:704
 msgid "Eye Color"
@@ -26328,7 +26331,7 @@ msgid "REPO (repository) Gramps ID %s"
 msgstr "REPO (хранилище) Gramps ID %s"
 
 #: ../gramps/plugins/lib/libgedcom.py:7049
-#: ../gramps/plugins/lib/libgedcom.py:8060
+#: ../gramps/plugins/lib/libgedcom.py:8061
 msgid "Only one phone number supported"
 msgstr "Поддерживается только один телефонный номер"
 
@@ -26470,11 +26473,11 @@ msgstr "Подтверждение: Флаг обработки"
 
 #. Okay we have no clue which temple this is.
 #. We should tell the user and store it anyway.
-#: ../gramps/plugins/lib/libgedcom.py:7998
+#: ../gramps/plugins/lib/libgedcom.py:7999
 msgid "Invalid temple code"
 msgstr "Неверный код церкви"
 
-#: ../gramps/plugins/lib/libgedcom.py:8094
+#: ../gramps/plugins/lib/libgedcom.py:8095
 msgid ""
 "Your GEDCOM file is corrupted. The file appears to be encoded using the "
 "UTF16 character set, but is missing the BOM marker."
@@ -26482,7 +26485,7 @@ msgstr ""
 "Файл GEDCOM поврежден. Похоже что файл использует набор символов UTF16, но в "
 "нем отсутствует пометка BOM."
 
-#: ../gramps/plugins/lib/libgedcom.py:8097
+#: ../gramps/plugins/lib/libgedcom.py:8098
 msgid "Your GEDCOM file is empty."
 msgstr "Файл GEDCOM пуст."
 
@@ -30726,13 +30729,42 @@ msgstr "Карта"
 msgid "Select tile cache directory for offline mode"
 msgstr "Выберите каталог с кэшем карт для автономного режима"
 
-#: ../gramps/plugins/lib/maps/osmgps.py:138
+#: ../gramps/plugins/lib/maps/osmgps.py:139
 #, python-format
 msgid "Can't create tiles cache directory %s"
 msgstr "Не удалось создать каталог с кэшем карт %s"
 
-#: ../gramps/plugins/lib/maps/osmgps.py:161
+#: ../gramps/plugins/lib/maps/osmgps.py:143
-#: ../gramps/plugins/lib/maps/osmgps.py:226
+#, python-format
+msgid ""
+"You must verify and change the tiles cache\n"
+"...\n"
+"[geography]\n"
+"...\n"
+"path='bad/path'\n"
+"...\n"
+"in the gramps.ini file :\n"
+"%s\n"
+"\n"
+"Before to change the gramps.ini file, you need to close gramps\n"
+"\n"
+"The next errors will be normal"
+msgstr ""
+"Необходимо проверить и изменить кэш тайлов\n"
+"...\n"
+"[geography]\n"
+"...\n"
+"path='неправильный/путь'\n"
+"...\n"
+"в файле gramps.ini:\n"
+"%s\n"
+"\n"
+"Перед изменением файла gramps.ini, необходимо закрыть gramps\n"
+"\n"
+"Получение последующих ошибок - это нормально"
+
+#: ../gramps/plugins/lib/maps/osmgps.py:174
+#: ../gramps/plugins/lib/maps/osmgps.py:239
 #, python-format
 msgid "Can't create tiles cache directory for '%s'."
 msgstr "Не удалось создать каталог с кэшем карт для '%s'."
@@ -34704,12 +34736,12 @@ msgstr "Неиспользуемые объекты"
 
 #. Add mark column
 #. Add ignore column
-#: ../gramps/plugins/tool/removeunused.py:184
+#: ../gramps/plugins/tool/removeunused.py:188
 #: ../gramps/plugins/tool/verify.py:554
 msgid "Mark"
 msgstr "Отметка"
 
-#: ../gramps/plugins/tool/removeunused.py:299
+#: ../gramps/plugins/tool/removeunused.py:303
 msgid "Remove unused objects"
 msgstr "Удалить неиспользуемые объекты"
 
@@ -36959,7 +36991,7 @@ msgstr "Контакт"
 #: ../gramps/plugins/webreport/basepage.py:1540
 #: ../gramps/plugins/webreport/webplugins.gpr.py:58
 msgid "Web Calendar"
-msgstr "Сетевой календарь"
+msgstr "Веб-календарь"
 
 #: ../gramps/plugins/webreport/basepage.py:1612
 #: ../gramps/plugins/webreport/media.py:399
@@ -37285,10 +37317,15 @@ msgstr "Авторское право"
 msgid "The copyright to be used for the web files"
 msgstr "Авторские права, которые будут использоваться для странички"
 
+#: ../gramps/plugins/webreport/narrativeweb.py:1690
+#: ../gramps/plugins/webreport/webcal.py:1700
+msgid "StyleSheet"
+msgstr "Стиль"
+
 #: ../gramps/plugins/webreport/narrativeweb.py:1696
 #: ../gramps/plugins/webreport/webcal.py:1703
 msgid "The stylesheet to be used for the web pages"
-msgstr "Таблица стилей для страницы"
+msgstr "Стиль отображения веб-страниц"
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1701
 msgid "Horizontal -- Default"
@@ -37543,10 +37580,10 @@ msgstr "Макс. ширина изображения"
 #: ../gramps/plugins/webreport/narrativeweb.py:1893
 msgid ""
 "This allows you to set the maximum width of the image shown on the media "
-"page. Set to 0 for no limit."
+"page."
 msgstr ""
 "Это поле позволяет задать максимальную ширину изображения на странице с "
-"документами. Укажите 0, чтобы не ограничивать ширину."
+"документами."
 
 #: ../gramps/plugins/webreport/narrativeweb.py:1898
 msgid "Max height of initial image"
@@ -38047,7 +38084,7 @@ msgstr ""
 #: ../gramps/plugins/webreport/webcal.py:1062
 #: ../gramps/plugins/webreport/webcal.py:1285
 msgid "Web Calendar Report"
-msgstr "Отчёт «Сетевой календарь»"
+msgstr "Отчёт «Веб-календарь»"
 
 #: ../gramps/plugins/webreport/webcal.py:333
 #, python-format
@@ -38131,10 +38168,6 @@ msgstr "Мой семейный календарь"
 msgid "The title of the calendar"
 msgstr "Заголовок для календаря"
 
-#: ../gramps/plugins/webreport/webcal.py:1700
-msgid "StyleSheet"
-msgstr "Таблица стилей"
-
 #: ../gramps/plugins/webreport/webcal.py:1741
 msgid "Content Options"
 msgstr "Параметры содержимого"
@@ -38371,11 +38404,11 @@ msgstr "Создаёт страницы (HTML) для отдельных лиц
 
 #: ../gramps/plugins/webreport/webplugins.gpr.py:59
 msgid "Produces web (HTML) calendars."
-msgstr "Создаёт сетевые календари (HTML)."
+msgstr "Создаёт веб-календари (HTML)."
 
 #: ../gramps/plugins/webstuff/webstuff.gpr.py:36
 msgid "Webstuff"
-msgstr "Сетевые-инструменты"
+msgstr "Сетевые инструменты"
 
 #: ../gramps/plugins/webstuff/webstuff.gpr.py:37
 msgid "Provides a collection of resources for the web"