Merge branch '3.6.3-devel' of https://github.com/rism-ch/muscat into …

…3.6.3-devel
rism-digital · Nov 16, 2016 · 8a9e5ae · 8a9e5ae
2 parents c663cdd + 488f42f
commit 8a9e5ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/config/editor_profiles/default/configurations/SourceFormOptions.yml b/config/editor_profiles/default/configurations/SourceFormOptions.yml
@@ -622,6 +622,7 @@
       - prf
       - prt
       - edt
+      - asn
       - oth
 "730":
   new_window: standard_titles

diff --git a/config/editor_profiles/default/configurations/SourceLabels.yml b/config/editor_profiles/default/configurations/SourceLabels.yml
@@ -384,7 +384,7 @@ doc_references:
       label: 
         it: PUBLIC NOTE
         fr: PUBLIC NOTE
-        de: Besetzung Incipit
+        de: Besetzung Satz
         en: Scoring in movement
 "033": 
   label: 
@@ -1943,7 +1943,7 @@ oth:
   label: 
     it: Altra funzione
     fr: Autre function
-    de: Andere
+    de: Sonstige Funktion
     en: Other function
 otm: 
   label: 

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -307,7 +307,7 @@ de:
   save_and_continue: "Speichern und weiter bearbeiten"
   save_and_exit: "Speichern und verlassen"
   cancel: "Abbrechen"
-  duplicate_confirm: "ARE YOU SURE YOU WANT TO DUPLICATE THIS RECORD?"
+  duplicate_confirm: "Wollen Sie diesen Titel wirklich duplizieren?"
 
   # Version history
   history_date: "Datum"
-Original file line number
+Diff line change
@@ Expand Up / @@ -622,6 +622,7 @@ @@
           - prf
           - prt
           - edt
+          - asn
           - oth
     "730":
       new_window: standard_titles
@@ Expand Down @@