diff --git a/app/models/template.rb b/app/models/template.rb index b10daa4..f0fdc00 100644 --- a/app/models/template.rb +++ b/app/models/template.rb @@ -19,7 +19,7 @@ # -relies on protected_attributes gem as syntax depricated in rails 4.2 attr_accessible :id, :org_id, :description, :published, :title, :locale, :customization_of, :is_default, :guidance_group_ids, :org, :plans, :phases, :dmptemplate_id, - :version, :visibility, :published, :as => [:default, :admin] + :migrated, :version, :visibility, :published, :as => [:default, :admin] # defines the export setting for a template object has_settings :export, class_name: 'Settings::Template' do |s| diff --git a/config/locale/app.pot b/config/locale/app.pot index cef3cb2..960a80d 100644 --- a/config/locale/app.pot +++ b/config/locale/app.pot @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: app 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-31 12:56+0100\n" -"PO-Revision-Date: 2017-05-31 12:56+0100\n" +"POT-Creation-Date: 2017-06-02 19:14+0100\n" +"PO-Revision-Date: 2017-06-02 19:14+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -57,9 +57,6 @@ msgid " on " msgstr "" -msgid " once you click save!" -msgstr "" - msgid " or " msgstr "" @@ -69,9 +66,6 @@ msgid " provided by " msgstr "" -msgid " saved the following answer:" -msgstr "" - msgid " team" msgstr "" @@ -408,9 +402,6 @@ msgid "Collaborators" msgstr "" -msgid "Combine their changes with your answer below and then save the answer again." -msgstr "" - msgid "Comment" msgstr "" @@ -567,6 +558,9 @@ msgid "Example Answer" msgstr "" +msgid "Example of answer" +msgstr "" + msgid "Export" msgstr "" @@ -1245,10 +1239,10 @@ msgid "The " msgstr "" -msgid "The edits in the box below will overwrite the existing answer from " +msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." msgstr "" -msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." +msgid "The following answer cannot be persisted" msgstr "" msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." @@ -1404,9 +1398,6 @@ msgid "Which DMP template would you like to use?" msgstr "" -msgid "While you were editing " -msgstr "" - msgid "Would you like to save them now?" msgstr "" @@ -1563,9 +1554,6 @@ msgid "ago" msgstr "" -msgid "answered" -msgstr "" - msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "" @@ -1656,9 +1644,6 @@ msgid "question" msgstr "" -msgid "questions" -msgstr "" - msgid "questions answered" msgstr "" @@ -1674,6 +1659,9 @@ msgid "select at least one theme" msgstr "" +msgid "since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again." +msgstr "" + msgid "template" msgstr "" diff --git a/config/locale/de/app.po b/config/locale/de/app.po index 1da96cc..bbc0715 100644 --- a/config/locale/de/app.po +++ b/config/locale/de/app.po @@ -61,9 +61,6 @@ msgid " on " msgstr "" -msgid " once you click save!" -msgstr "" - msgid " or " msgstr "" @@ -75,9 +72,6 @@ msgid " provided by " msgstr " von " -msgid " saved the following answer:" -msgstr "" - #, fuzzy msgid " team" msgstr "am" @@ -438,9 +432,6 @@ msgid "Collaborators" msgstr "Mitarbeitende" -msgid "Combine their changes with your answer below and then save the answer again." -msgstr "" - msgid "Comment" msgstr "Kommentar" @@ -603,6 +594,10 @@ msgid "Example Answer" msgstr "Beispielantwort" +#, fuzzy +msgid "Example of answer" +msgstr "Beispielantwort" + msgid "Export" msgstr "Export" @@ -1306,12 +1301,12 @@ msgid "The " msgstr "" -msgid "The edits in the box below will overwrite the existing answer from " -msgstr "" - msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." msgstr "Die E-Mail -Adresse des Administrators in Ihrer Org. Ihre Benutzer werden diese Adresse verwenden, wenn sie Fragen haben." +msgid "The following answer cannot be persisted" +msgstr "" + msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." msgstr "Die hier ausgewählten Einträge werden in der Tabelle unten angezeigt. Sie können die Daten durch jeden ihrer Tabellenköpfe sortieren oder filtern, indem Sie eine Zeichenkette in der Suchbox eingeben." @@ -1474,9 +1469,6 @@ msgid "Which DMP template would you like to use?" msgstr "templates" -msgid "While you were editing " -msgstr "" - msgid "Would you like to save them now?" msgstr "Wollen Sie sie jetzt sichern?" @@ -1658,10 +1650,6 @@ msgstr "" #, fuzzy -msgid "answered" -msgstr "Beantwortet " - -#, fuzzy msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "annährend %{space_used}% des verfügbaren Platzes wird verwendet (max. %{num_pages} Seiten)" @@ -1766,10 +1754,6 @@ msgid "question" msgstr "Frage" -#, fuzzy -msgid "questions" -msgstr "Fragen" - msgid "questions answered" msgstr "Fragen beantwortet" @@ -1787,6 +1771,9 @@ msgid "select at least one theme" msgstr "select at least one theme" +msgid "since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again." +msgstr "" + #, fuzzy msgid "template" msgstr "templates" diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po index 510f97c..f35d162 100644 --- a/config/locale/en_GB/app.po +++ b/config/locale/en_GB/app.po @@ -60,9 +60,6 @@ msgid " on " msgstr " on " -msgid " once you click save!" -msgstr " once you click save!" - #, fuzzy msgid " or " msgstr " on " @@ -74,9 +71,6 @@ msgid " provided by " msgstr " by " -msgid " saved the following answer:" -msgstr " saved the following answer:" - msgid " team" msgstr " team" @@ -424,9 +418,6 @@ msgid "Collaborators" msgstr "Collaborators" -msgid "Combine their changes with your answer below and then save the answer again." -msgstr "" - msgid "Comment" msgstr "Comment" @@ -586,6 +577,10 @@ msgid "Example Answer" msgstr "Example of answer" +#, fuzzy +msgid "Example of answer" +msgstr "Example of answer" + msgid "Export" msgstr "Export" @@ -1283,12 +1278,13 @@ msgid "The " msgstr "The " -msgid "The edits in the box below will overwrite the existing answer from " -msgstr "The edits in the box below will overwrite the existing answer from " - msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." msgstr "The email address of an administrator at your organisation. Your users will use this address if they have questions." +#, fuzzy +msgid "The following answer cannot be persisted" +msgstr "The " + msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." msgstr "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." @@ -1448,9 +1444,6 @@ msgid "Which DMP template would you like to use?" msgstr "template" -msgid "While you were editing " -msgstr "" - msgid "Would you like to save them now?" msgstr "Would you like to save them now?" @@ -1613,9 +1606,6 @@ msgid "ago" msgstr "ago" -msgid "answered" -msgstr "answered" - msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "approx. %{space_used}%% of available space used (max %{num_pages} pages)" @@ -1710,9 +1700,6 @@ msgid "question" msgstr "question" -msgid "questions" -msgstr "questions" - msgid "questions answered" msgstr "questions answered" @@ -1728,6 +1715,10 @@ msgid "select at least one theme" msgstr "select at least one theme" +#, fuzzy +msgid "since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again." +msgstr " on " + msgid "template" msgstr "template" diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po index af5a1be..3bae78c 100644 --- a/config/locale/en_US/app.po +++ b/config/locale/en_US/app.po @@ -60,9 +60,6 @@ msgid " on " msgstr " on " -msgid " once you click save!" -msgstr " once you click save!" - #, fuzzy msgid " or " msgstr " on " @@ -74,9 +71,6 @@ msgid " provided by " msgstr " by " -msgid " saved the following answer:" -msgstr " saved the following answer:" - msgid " team" msgstr " team" @@ -424,9 +418,6 @@ msgid "Collaborators" msgstr "Collaborators" -msgid "Combine their changes with your answer below and then save the answer again." -msgstr "" - msgid "Comment" msgstr "Comment" @@ -586,6 +577,10 @@ msgid "Example Answer" msgstr "Example of answer" +#, fuzzy +msgid "Example of answer" +msgstr "Example of answer" + msgid "Export" msgstr "Export" @@ -1283,12 +1278,13 @@ msgid "The " msgstr "The " -msgid "The edits in the box below will overwrite the existing answer from " -msgstr "The edits in the box below will overwrite the existing answer from " - msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." msgstr "The email address of an administrator at your organization. Your users will use this address if they have questions." +#, fuzzy +msgid "The following answer cannot be persisted" +msgstr "The " + msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." msgstr "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." @@ -1448,9 +1444,6 @@ msgid "Which DMP template would you like to use?" msgstr "template" -msgid "While you were editing " -msgstr "" - msgid "Would you like to save them now?" msgstr "Would you like to save them now?" @@ -1613,9 +1606,6 @@ msgid "ago" msgstr "ago" -msgid "answered" -msgstr "answered" - msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "approx. %{space_used}%% of available space used (max %{num_pages} pages)" @@ -1710,9 +1700,6 @@ msgid "question" msgstr "question" -msgid "questions" -msgstr "questions" - msgid "questions answered" msgstr "questions answered" @@ -1728,6 +1715,10 @@ msgid "select at least one theme" msgstr "select at least one theme" +#, fuzzy +msgid "since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again." +msgstr " on " + msgid "template" msgstr "template" diff --git a/config/locale/es/app.po b/config/locale/es/app.po index c0cf399..55298f2a 100644 --- a/config/locale/es/app.po +++ b/config/locale/es/app.po @@ -60,9 +60,6 @@ msgid " on " msgstr "" -msgid " once you click save!" -msgstr "" - msgid " or " msgstr "" @@ -73,9 +70,6 @@ msgid " provided by " msgstr " por " -msgid " saved the following answer:" -msgstr "" - #, fuzzy msgid " team" msgstr "am" @@ -434,9 +428,6 @@ msgid "Collaborators" msgstr "Colaboradores" -msgid "Combine their changes with your answer below and then save the answer again." -msgstr "" - msgid "Comment" msgstr "Comentario" @@ -599,6 +590,10 @@ msgid "Example Answer" msgstr "Respuesta de ejemplo" +#, fuzzy +msgid "Example of answer" +msgstr "Respuesta de ejemplo" + msgid "Export" msgstr "Exportar" @@ -1299,10 +1294,10 @@ msgid "The " msgstr "" -msgid "The edits in the box below will overwrite the existing answer from " +msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." msgstr "" -msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." +msgid "The following answer cannot be persisted" msgstr "" msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." @@ -1467,9 +1462,6 @@ msgid "Which DMP template would you like to use?" msgstr "templates" -msgid "While you were editing " -msgstr "" - msgid "Would you like to save them now?" msgstr "¿Quere grabar los cambios ahora?" @@ -1643,10 +1635,6 @@ msgstr "" #, fuzzy -msgid "answered" -msgstr "Contestado " - -#, fuzzy msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "aprox. %{space_used}% de disponibilidad del espacio usado (máx. %{num_pages} páginas)" @@ -1749,10 +1737,6 @@ msgid "question" msgstr "Pregunta" -#, fuzzy -msgid "questions" -msgstr "Preguntas" - msgid "questions answered" msgstr "preguntas respondidas" @@ -1770,6 +1754,9 @@ msgid "select at least one theme" msgstr "" +msgid "since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again." +msgstr "" + #, fuzzy msgid "template" msgstr "templates" diff --git a/config/locale/fr/app.po b/config/locale/fr/app.po index 7879c76..5fb2580 100644 --- a/config/locale/fr/app.po +++ b/config/locale/fr/app.po @@ -60,9 +60,6 @@ msgid " on " msgstr "" -msgid " once you click save!" -msgstr "" - msgid " or " msgstr "" @@ -73,9 +70,6 @@ msgid " provided by " msgstr " par " -msgid " saved the following answer:" -msgstr "" - #, fuzzy msgid " team" msgstr "am" @@ -432,9 +426,6 @@ msgid "Collaborators" msgstr "Collaborateurs" -msgid "Combine their changes with your answer below and then save the answer again." -msgstr "" - msgid "Comment" msgstr "Commentaire" @@ -597,6 +588,10 @@ msgid "Example Answer" msgstr "Exemple de réponse" +#, fuzzy +msgid "Example of answer" +msgstr "Exemple de réponse" + msgid "Export" msgstr "Exporter" @@ -1296,10 +1291,10 @@ msgid "The " msgstr "" -msgid "The edits in the box below will overwrite the existing answer from " +msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." msgstr "" -msgid "The email address of an administrator at your organisation. Your users will use this address if they have questions." +msgid "The following answer cannot be persisted" msgstr "" msgid "The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box." @@ -1464,9 +1459,6 @@ msgid "Which DMP template would you like to use?" msgstr "templates" -msgid "While you were editing " -msgstr "" - msgid "Would you like to save them now?" msgstr "Voulez-vous faire la sauvegarde maintenant?" @@ -1640,10 +1632,6 @@ msgstr "" #, fuzzy -msgid "answered" -msgstr "Réponse " - -#, fuzzy msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)" msgstr "env. %{space_used}% despace disponible utilisé (%{num_pages} pages maxi)" @@ -1746,10 +1734,6 @@ msgid "question" msgstr "Question" -#, fuzzy -msgid "questions" -msgstr "Questions" - msgid "questions answered" msgstr "questions avec réponses" @@ -1767,6 +1751,9 @@ msgid "select at least one theme" msgstr "" +msgid "since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again." +msgstr "" + #, fuzzy msgid "template" msgstr "templates" diff --git a/public/shib_logo.png b/public/shib_logo.png deleted file mode 100644 index 191b508..0000000 --- a/public/shib_logo.png +++ /dev/null Binary files differ