#2657,#1718 use ngettext (contribution by josip)

svn: r11828

configure.in

@@ -110,7 +110,7 @@ AC_MSG_RESULT($has_pyglade)
 
 AC_CONFIG_FILES([
 po/Makefile.in
-po/Makevars.in
+po/Makevars
 m4/Makefile
 Makefile
 gramps.sh

po/Makevars.in

@@ -1,5 +1,8 @@
 # Makefile variables for PO directory using GNU gettext.
 
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
 
 # These options get passed to xgettext.
 

po/POTFILES.in

@@ -72,6 +72,7 @@ src/Merge/_MergeSource.py
 # DataViews package
 src/DataViews/EventView.py
 src/DataViews/FamilyList.py
+#src/DataViews/GeoView.py
 src/DataViews/__init__.py
 src/DataViews/MediaView.py
 src/DataViews/GrampletView.py
@@ -258,6 +259,7 @@ src/plugins/export/ExportFtree.py
 src/plugins/export/ExportGedcom.py
 src/plugins/export/ExportGeneWeb.py
 src/plugins/export/ExportPkg.py
+#src/plugins/export/ExportSql.py
 src/plugins/export/ExportVCalendar.py
 src/plugins/export/ExportVCard.py
 
@@ -319,7 +321,9 @@ src/plugins/quickview/AttributeMatch.py
 src/plugins/quickview/FilterByName.py
 src/plugins/quickview/lineage.py
 src/plugins/quickview/OnThisDay.py
+#src/plugins/quickview/Query.py
 src/plugins/quickview/References.py
+src/plugins/quickview/Reporef.py
 src/plugins/quickview/SameSurnames.py
 src/plugins/quickview/siblings.py
 

po/POTFILES.skip

@@ -1,7 +1,19 @@
+src/DataViews/MapView.py
+src/Filters/Rules/_HasGalleryBase.py
+src/Filters/Rules/_HasLDSBase.py
+src/Filters/Rules/_HasNoteBase.py
+src/Filters/Rules/_HasReferenceCountOf.py
+src/Filters/Rules/_HasSourceBase.py
 src/gen/lib/styledtext.py
 src/gen/lib/styledtexttagtype.py
 src/LdsUtils.py
 src/Mime/_WinMime.py
-src/ReportBase/_DocReportDialog.py
+src/plugins/docgen/PdfDoc.py
-src/docgen/PdfDoc.py
 src/plugins/tool/DateParserDisplayTest.py
+src/plugins/tool/DumpGenderStats.py
+src/plugins/tool/PHPGedViewConnector.py
+src/plugins/tool/TestcaseGenerator.py
+src/plugins/tool/phpgedview.glade
+src/ReportBase/_DocReportDialog.py
+
+

src/DataViews/RelationView.py

@@ -791,7 +791,7 @@ class RelationshipView(PageView.PersonNavView):
             else:
                 count = 0
             if count > 1 :
-                childmsg = ngettext(" (1 sibling)", " (%d siblings)", count) % count
+                childmsg = ngettext(" (%d sibling)", " (%d siblings)", count) % count
             elif count == 1 :
                 gender = self.dbstate.db.get_person_from_handle(\
                                         child_list[0]).gender
@@ -847,7 +847,7 @@ class RelationshipView(PageView.PersonNavView):
                     else:
                         count = 0
                     if count > 1 :
-                        childmsg = ngettext(" (1 sibling)"," (%d siblings)", count) % count
+                        childmsg = ngettext(" (%d sibling)"," (%d siblings)", count) % count
                     elif count == 1 :
                         gender = self.dbstate.db.get_person_from_handle(\
                                                 child_list[0]).gender
@@ -1267,7 +1267,7 @@ class RelationshipView(PageView.PersonNavView):
             else:
                 count = 0
             if count >= 1 :
-                childmsg = ngettext(" (1 child)"," (%d children)", count) % count
+                childmsg = ngettext(" (%d child)"," (%d children)", count) % count
             else :
                 childmsg = _(" (no children)")
             box = self.get_people_box(handle, post_msg=childmsg)
@@ -1313,7 +1313,7 @@ class RelationshipView(PageView.PersonNavView):
                 else:
                     count = 0
                 if count >= 1 :
-                    childmsg = ngettext(" (1 child)"," (%d children)", count) % count
+                    childmsg = ngettext(" (%d child)"," (%d children)", count) % count
                 else :
                     childmsg = _(" (no children)")
                 box = self.get_people_box(post_msg=childmsg)