Merge with 1487dcf42f0e25d9268d4844d363f99e5a1941db
authorveltr
Fri, 27 Sep 2013 16:09:29 +0200
changeset 124 dd5358d4d2ac
parent 122 62b6761a61c5 (diff)
parent 123 11f2aa317b70 (current diff)
child 125 5f7f0056de36
Merge with 1487dcf42f0e25d9268d4844d363f99e5a1941db
.settings/org.eclipse.core.resources.prefs
src/jocondelab/settings.py
--- a/.settings/org.eclipse.core.resources.prefs	Fri Sep 27 15:58:40 2013 +0200
+++ b/.settings/org.eclipse.core.resources.prefs	Fri Sep 27 16:09:29 2013 +0200
@@ -1,9 +1,27 @@
-eclipse.preferences.version=1
-encoding//src/core/migrations/0008_populate_nb_notice.py=utf-8
-encoding//src/core/models/term.py=utf-8
-encoding//src/jocondelab/management/commands/import_terms.py=utf-8
-encoding//src/jocondelab/migrations/0005_auto__add_termlinks__add_dbpediafields.py=utf-8
-encoding//src/jocondelab/settings.py=utf-8
-encoding//src/jocondelab/utils.py=utf-8
-encoding//src/jocondelab/views/back_office.py=utf-8
-encoding//virtualenv/web/env/venv_jocondelab/lib/python2.7/site-packages/django/conf/locale/vi/formats.py=utf-8
+eclipse.preferences.version=1
+encoding//src/core/migrations/0008_populate_nb_notice.py=utf-8
+encoding//src/core/models/notice.py=utf-8
+encoding//src/core/models/term.py=utf-8
+encoding//src/core/settings.py=utf-8
+encoding//src/get_notice_years.py=utf-8
+encoding//src/jocondelab/management/commands/import_countries.py=utf-8
+encoding//src/jocondelab/management/commands/import_csv.py=utf-8
+encoding//src/jocondelab/management/commands/import_dbpedia_fields.py=utf-8
+encoding//src/jocondelab/management/commands/import_dbpedia_geo_years.py=utf-8
+encoding//src/jocondelab/management/commands/import_extra_years.py=utf-8
+encoding//src/jocondelab/management/commands/import_skos.py=utf-8
+encoding//src/jocondelab/management/commands/import_term_labels.py=utf-8
+encoding//src/jocondelab/management/commands/import_term_list.py=utf-8
+encoding//src/jocondelab/management/commands/import_terms.py=utf-8
+encoding//src/jocondelab/management/commands/populate_notice_years.py=utf-8
+encoding//src/jocondelab/migrations/0005_auto__add_termlinks__add_dbpediafields.py=utf-8
+encoding//src/jocondelab/migrations/0012_auto__add_notice_years.py=utf-8
+encoding//src/jocondelab/models/contribution.py=utf-8
+encoding//src/jocondelab/models/data.py=utf-8
+encoding//src/jocondelab/models/displaysettings.py=utf-8
+encoding//src/jocondelab/settings.py=utf-8
+encoding//src/jocondelab/utils.py=utf-8
+encoding//src/jocondelab/views/ajax.py=utf-8
+encoding//src/jocondelab/views/back_office.py=utf-8
+encoding//src/jocondelab/views/front_office.py=utf-8
+encoding//virtualenv/web/env/venv_jocondelab/lib/python2.7/site-packages/django/conf/locale/vi/formats.py=utf-8
--- a/src/jocondelab/settings.py	Fri Sep 27 15:58:40 2013 +0200
+++ b/src/jocondelab/settings.py	Fri Sep 27 16:09:29 2013 +0200
@@ -52,6 +52,7 @@
     ('ca', ugettext('Catalan')),
     ('eu', ugettext('Basque')),
     ('br', ugettext('Breton')),
+    ('oc', ugettext('Occitan')),
 )
 
 
Binary file virtualenv/res/src/django-1.5.4-IRI.tar.gz has changed