alpha1 environment, what should be the VERSION into gen/const.py.in ?

svn: r20810

MANIFEST.in

@@ -37,8 +37,8 @@ global-exclude *.pyo
 global-exclude *.bak
 
 # Remove directories which should not be included in the distribution
-prune src/guiQML
+prune gramps/guiQML
-prune src/webapp
+prune gramps/webapp
 
 # Remove Makefiles used by autotools
 global-exclude Makefile*

RELEASE_NOTES

@@ -1,24 +1,33 @@
-Gramps 3.2 Release Notes
+"UNSTABLE Gramps 4.0.0 Alpha1 release.
 
-General Improvements
+This is a technology preview to allow plugin writers and packagers-installer 
+writers to update their plugins and scripts. This release is not production 
+ready, so use for testing!"
 
-* New Plugin System
+It is recommended to use Gramps 4.0.0 with python 3.2 so as to be ready 
-In the Help Menu -> Menu Status, all available plugins are visible. All plugins can be hidden, saving resources and hiding options you do not need. Eg: You don't use the Pedigree View? Hide it in the Plugin Status, and it will not be present anymore. You don't use vcard export? Hide it in the Plugin Status, and it will not be offered anymore.
+for the future (python 2.7 works though). 
 
-* Faster
+The dependencies for Gramps 4.0.0 are _completely_ different than 3.4 due 
-Many under the hood improvements have occurred that should improve perfamance enormously. Yes, new features are present to use all your processing power, but they are all implemented as plugins that can be hidden. Eg: Insert of a person in a 30000 people family tree took 4sec on 1.4Ghz PC in 3.1, Now it is done in milliseconds.
+to the switch to GObject introspection, and the removal of autotools. So 
+only install 4.0.0 if you are certain you can obtain the dependencies, 
+see README and INSTALL. 
 
-*New Views
+For linux, in Ubuntu 12.10 you can install 4.0.0, but you will need to 
-There are new views, and some views have been greatly improved
+compile and install osmgpsmap manually to have the maps working (see 
-  - People view can now be sorted on the columns
+http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion#OsmGpsMap_for_Geography ) 
-  - A Place treeview is present, nicely grouping your places under country groups
-  - GeoView has left it's beta status behind and shows your data on an 
-    online map (Openstreetmap or google maps, fast internet connection required)
-  - Help Menu -> Extra Reports/Tools open a webpage with downloadable extra views
 
 
-Other Improvements
+Major enhancements in Gramps 4.0.0:
 
-* Styled Notes now in most output formats that support styles, eg in the web report
+* GEP 8: code reorganization: http://www.gramps-project.org/wiki/index.php?title=GEPS_008:_File_Organization
-* New languages
+
-* Select language in which report should be created (only present now in some reports)
+* GEP 26: Replace make: http://www.gramps-project.org/wiki/index.php?title=GEPS_026:_Replace_%27make%27_for_Gramps_build
+
+* GEP 29: Gtk 3 :http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion
+
+* GEP 31: Python 3 support: http://www.gramps-project.org/wiki/index.php?title=GEPS_031:_Python_3_support
+
+More info in the manual 
+http://www.gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_What%27s_new%3F
+
+Everybody is invited to update the manual to make it current!

gramps/gen/datehandler/_date_nb.py

@@ -176,4 +176,4 @@ class DateDisplayNb(DateDisplay):
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('nb_NO', 'nb', 'norsk', 'Norwegian'), DateParserNb, DateDisplayNb)
+register_datehandler(('nb_NO', 'nb', 'nn_NO', 'nn', 'norsk', 'Norwegian'), DateParserNb, DateDisplayNb)

po/check_po

@@ -532,6 +532,7 @@ def analyze_msgs( args, fname, msgs, nr_templates = None, nth = 0 ):
 
 		if msg.is_fuzzy:
 			nr_fuzzy += 1
+			continue
 
 		for c in checks:
 			c.process( msg )
@@ -548,7 +549,6 @@ def analyze_msgs( args, fname, msgs, nr_templates = None, nth = 0 ):
 
 	for c in checks:
 		c.summary()
-		c.diag()
 
 	po_coverage = (1.0 - (float(nr_untranslated) / float(nr_msgs))) * 100
 	print "%-20s%5.2f%%" % ( "PO Coverage:",       po_coverage )
@@ -565,6 +565,9 @@ def analyze_msgs( args, fname, msgs, nr_templates = None, nth = 0 ):
 	else:
 		print text + ' (previous gramps.pot)'
 
+	for c in checks:
+		c.diag()
+
 def main():
     
     parser = ArgumentParser( description='This program validates a PO file for GRAMPS.')

po/nb.po

@@ -396,7 +396,7 @@ msgid "Could not rename family tree"
 msgstr "Kunne ikke omdøpe fila"
 
 #: ../gramps/cli/clidbman.py:406
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "\n"
 "ERROR: Wrong database path in Edit Menu->Preferences.\n"

po/sv.po

@@ -12493,7 +12493,7 @@ msgid "Color"
 msgstr "Färg"
 
 #: ../gramps/gui/plug/_guioptions.py:1513
-#, python-format
+#, fuzzy, python-format
 msgid "Select color for %s"
 msgstr "Välj färg på teckensnitt"
 
@@ -12703,7 +12703,7 @@ msgstr ""
 "att återse alternativ."
 
 #: ../gramps/gui/plug/export/_exportassistant.py:452
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The data will be saved as follows:\n"
 "\n"
@@ -19567,6 +19567,7 @@ msgstr "GEDCOM importrappport: %s fel hittades"
 msgid "Tag recognized but not supported"
 msgstr "Flagga upptäck, men stöds ej"
 
+#, fuzzy
 #: ../gramps/plugins/lib/libgedcom.py:2840
 msgid "Line ignored as not understood"
 msgstr "Rad %d gick inte att förstå, så den ignorerades."
@@ -27089,7 +27090,7 @@ msgid "Number of merges done"
 msgstr "Antal utförda sammanslagningar"
 
 #: ../gramps/plugins/tool/mergecitations.py:226
-#, python-format
+#, fuzzy, python-format
 msgid "%(num)d citation merged"
 msgid_plural "%(num)d citations merged"
 msgstr[0] "%d citering sammanslagen"

setup.py

@@ -47,7 +47,7 @@ if sys.version_info[0] < 3:
     import commands
 from stat import ST_MODE
 
-VERSION = '4.0.0'
+VERSION = '4.0.0-alpha1'
 ALL_LINGUAS = ('bg', 'ca', 'cs', 'da', 'de', 'el', 'en_GB', 'es', 'fi', 'fr', 'he',
                'hr', 'hu', 'it', 'ja', 'lt', 'nb', 'nl', 'nn', 'pl', 'pt_BR',
                'pt_PT', 'ru', 'sk', 'sl', 'sq', 'sv', 'uk', 'vi', 'zh_CN')
@@ -96,8 +96,15 @@ def build_trans(build_cmd):
         if newer(po_file, mo_file):
             cmd = 'msgfmt %s -o %s' % (po_file, mo_file)
             if os.system(cmd) != 0:
+                os.remove(mo_file)
                 msg = 'ERROR: Building language translation files failed.'
-                raise SystemExit(msg)
+                ask = msg + '\n Continue building y/n [n] '
+                if sys.version_info[0] < 3:
+                    reply = raw_input(ask)
+                else:
+                    reply = input(ask)
+                if reply in ['n', 'N']:
+                    raise SystemExit(msg)
 
         #linux specific piece:
         target = 'share/locale/' + lang + '/LC_MESSAGES'