kiteditor 1.0.11 → 1.0.12

data/{vendor → app}/assets/javascripts/mercury/dialogs/forecolor.js.coffee

@@ -1,6 +1,6 @@
 @Mercury.dialogHandlers.foreColor = ->
   @element.find('.picker, .last-picked').on 'click', (event) =>
-    color = jQuery(event.target).css('background-color')
+    color = jQuery(event.target).css('background-color').toHex()
     @element.find('.last-picked').css({background: color})
     @button.css({backgroundColor: color})
     Mercury.trigger('action', {action: 'foreColor', value: color})

data/{vendor → app}/assets/javascripts/mercury/dialogs/snippetpanel.js.coffee

@@ -7,4 +7,4 @@
 
   # when an element is dragged, set it so we have a global object
   @element.find('img[data-snippet]').on 'dragstart', ->
-    Mercury.snippet = jQuery(@).data('snippet')
+    Mercury.snippet = {name: jQuery(@).data('snippet'), hasOptions: !(jQuery(@).data('options') == false)}

data/{vendor → app}/assets/javascripts/mercury/lightview.js.coffee

@@ -1,19 +1,27 @@
 @Mercury.lightview = (url, options = {}) ->
-  Mercury.lightview.show(url, options)
-  return Mercury.lightview
+  Mercury.lightview.instance ||= new Mercury.Lightview(url, options)
+  Mercury.lightview.instance.show(url, options)
+  return Mercury.lightview.instance
 
-jQuery.extend Mercury.lightview,
-  minWidth: 400
 
-  show: (@url, @options = {}) ->
+class @Mercury.Lightview
+
+  constructor: (@url, @options = {}) ->
+
+
+  show: (url, options) ->
+    @url = url || @url
+    @options = options || @options
+    @options.ujsHandling = true unless @options.ujsHandling == false
+
     Mercury.trigger('focus:window')
-    @initialize()
+    @initializeLightview()
     if @visible then @update() else @appear()
     if @options.content
-      setTimeout 500, => @loadContent(@options.content)
+      setTimeout((=> @loadContent(@options.content)), 500)
 
 
-  initialize: ->
+  initializeLightview: ->
     return if @initialized
     @build()
     @bindEvents()
@@ -46,9 +54,10 @@ jQuery.extend Mercury.lightview,
     @titleElement.find('.mercury-lightview-close').on 'click', =>
       @hide()
 
-    @element.on 'ajax:beforeSend', (event, xhr, options) =>
-      options.success = (content) =>
-        @loadContent(content)
+    if @options.ujsHandling
+      @element.on 'ajax:beforeSend', (event, xhr, options) =>
+        options.success = (content) =>
+          @loadContent(content)
 
     jQuery(document).on 'keydown', (event) =>
        @hide() if event.keyCode == 27 && @visible
@@ -146,7 +155,7 @@ jQuery.extend Mercury.lightview,
     return unless @url
     @element.addClass('loading')
     if Mercury.preloadedViews[@url]
-      setTimeout(10, => @loadContent(Mercury.preloadedViews[@url]))
+      setTimeout((=> @loadContent(Mercury.preloadedViews[@url])), 10)
     else
       jQuery.ajax @url, {
         headers: Mercury.ajaxHeaders()
@@ -160,7 +169,7 @@ jQuery.extend Mercury.lightview,
 
 
   loadContent: (data, options = null) ->
-    @initialize()
+    @initializeLightview()
     @options = options || @options
     @setTitle()
     @loaded = true
@@ -175,11 +184,20 @@ jQuery.extend Mercury.lightview,
     @options.afterLoad.call(@) if @options.afterLoad
     if @options.handler
       if Mercury.modalHandlers[@options.handler]
-        Mercury.modalHandlers[@options.handler].call(@)
+        if typeof(Mercury.modalHandlers[@options.handler]) == 'function'
+          Mercury.modalHandlers[@options.handler].call(@)
+        else
+          jQuery.extend(@, Mercury.modalHandlers[@options.handler])
+          @initialize()
       else if Mercury.lightviewHandlers[@options.handler]
-        Mercury.lightviewHandlers[@options.handler].call(@)
+        if typeof(Mercury.lightviewHandlers[@options.handler]) == 'function'
+          Mercury.lightviewHandlers[@options.handler].call(@)
+        else
+          jQuery.extend(@, Mercury.lightviewHandlers[@options.handler])
+          @initialize()
 
     @element.localize(Mercury.locale()) if Mercury.config.localization.enabled
+    @element.find('.lightview-close').on('click', @hide)
     @resize()
 
 
@@ -187,15 +205,18 @@ jQuery.extend Mercury.lightview,
     @titleElement.find('span').html(Mercury.I18n(@options.title))
 
 
+  serializeForm: ->
+    return @element.find('form').serializeObject() || {}
+
+
   reset: ->
     @titleElement.find('span').html('')
     @contentElement.html('')
 
 
-  hide: ->
+  hide: =>
     return if @showing
     @options = {}
-    @initialized = false
 
     Mercury.trigger('focus:frame')
     @element.hide()

data/app/assets/javascripts/mercury/locales/ar.locale.js.coffee

@@ -0,0 +1,201 @@
+Mercury.I18n['ar'] =
+  # ## Javascript Strings
+
+  # ### Default Configuration
+  "Save": "حفظ"
+  "Save this page": "حفظ الصفحة"
+  "Preview": "معاينة"
+  "Preview this page": "معاينة هذه الضفحة"
+  "Undo": "تراجع"
+  "Undo your last action": "تراجع عن أخر فعل"
+  "Redo": "إعادة"
+  "Redo your last action": "إعادة أخر فعل"
+  "Link": "رابط"
+  "Insert Link": "إدراج رابط"
+  "Media": "ملف ميديا"
+  "Insert Media (images and videos)": "إدراج ملف ميديا (صور أو فيديو)"
+  "Table": "جدول"
+  "Insert Table": "إدراج جدول"
+  "Character": "حرف"
+  "Special Characters": "حرف مميز "
+  "Snippet": "قصاصة"
+  "Snippet Panel": "لوحة قصاصات"
+  "History": "سجل"
+  "Page Version History": "نسج مسجلة من الصفحة"
+  "Notes": "ملاحظات"
+  "Page Notes": "ملاحظات الصفحة"
+  "Style": "نمط"
+  "Block Format": "تنسيق كتلة"
+  "Background Color": "لون الخلفية"
+  "Text Color": "لون النص"
+  "Bold": "واضح"
+  "Italicize": "مائلة"
+  "Overline": "خط فوق"
+  "Strikethrough": " خط فى الوسط "
+  "Underline": "خط تحت"
+  "Subscript": " نص سفلى"
+  "Superscript": " نص علوى"
+  "Align Left": "محاذاة إلى اليسار"
+  "Center": "محاذاة إلى  الوسط"
+  "Align Right": "محاذاة إلى اليمين"
+  "Justify Full": "ضبط كامل"
+  "Unordered List": "قائمة غير مرتبة"
+  "Numbered List": "قائمة مرقمة"
+  "Decrease Indentation": "إنقاص المسافة البادئة"
+  "Increase Indentation": "زيادة المسافة البادئة"
+  "Insert Table Row": "إدراج صف "
+  "Insert a table row before the cursor": "إدراج صف قبل المؤشر"
+  "Insert a table row after the cursor": "إدراج صف بعد المؤشر"
+  "Delete Table Row": "حذف صف"
+  "Delete this table row": "حذف هذا الصف"
+  "Insert Table Column": "إضافة عمود للجدول"
+  "Insert a table column before the cursor": "إدراج عمود قبل المؤشر"
+  "Insert a table column after the cursor": "إدراج عمود بعد المؤشر"
+  "Delete Table Column": "حذف عمود جدول"
+  "Delete this table column": "حذف هذا العمود"
+  "Increase Cell Columns": "زيادة أعمدة الخلية"
+  "Decrease Cell Columns": "إنقاص أعمدة الخلية"
+  "Increase Cell Rows": "زيادة صفوف الخلية"
+  "Decrease Cell Rows": "إنقاص صفوف الخلية"
+  "Horizontal Rule": "مسطرة أفقية"
+  "Insert a horizontal rule": "إدراج مسطرة أفقية"
+  "Remove Formatting": "إزالة التنسيق"
+  "Remove formatting for the selection": "إزالة التنسيق لاختيار"
+  "Edit HTML": "تعديل ال HTML"
+  "Edit the HTML content": "تعديل ال HTML"
+  "Edit Snippet Settings": "تعديل ضبط قصاصة"
+  "Remove Snippet": "إزالة القصاصات"
+
+  # ### General
+  # Error Messages
+  "Mercury.Regions.%s is unsupported in this client. Supported browsers are %s.": "Mercury.Regions.%s غير غير مدعوم فى هذا المتصفح. المتصفحات المدعومة هى %s"
+  "Mercury.PageEditor can only be instantiated once.": "Mercury.PageEditor لا يمكن إلا أن يمثل مرة واحدة.."
+  "Opera isn't a fully supported browser, your results may not be optimal.": "أوبرا ليست متصفح متوافق بالكامل، قد لا تكون نتائجك الأمثل."
+  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PageEditor غير قاد على تحميل: %s\n\nمن فضلك حدث الصفحة ."
+  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "نوع المساحة تالف, لا يوجد نوع , أو \"%s\" غير معروف للمساحة \"%s\""
+  "Mercury was unable to save to the url: %s": "غير قادر على حفظ الرابط: %s"
+  "invalid": "باطل"
+  "can't be blank": "لا يمكن أن تكون فارغة"
+  # Confirmations
+  "You have unsaved changes.Are you sure you want to leave without saving them first?": "لديك تغييرات غير محفوظة. هل أنت متأكد أنك تريد أن تترك دون حفظها أولا؟"
+
+  # ### Toolbar / Buttons
+  # Error Messages
+  "Unknown button type \"%s\" used for the \"%s\" button.": "نوع زر غير معروف \"%s\" مستخدمة ل \"%s\""
+  "Unknown button structure -- please provide an array, object, or string for \"%s\".": "بنية زر غير معروفة - يرجى تقديم مجموعة واسعة، كائنات، أو كلمة \"%s\"."
+
+  # ### Modals / Dialogs / Etc.
+  # Error Messages
+  "Mercury was unable to load %s for the \"%s\" dialog.": "غير قادر على تحميل %s للنافذة \"%s\"."
+  "Mercury was unable to load %s for the lightview.": "غير قادر على تحميل %s للضوء."
+  "Mercury was unable to load %s for the modal.": "غير قادر على تحميل %s للنافذة."
+
+  # ### Snippets
+  # Error Messages
+  "Error loading the preview for the \"%s\" snippet.": "خطأ فى تحميل معاينة القصاصة \"%s\"."
+  # Misc
+  "Snippet Options": "خيارات القصاصة"
+
+  # ### Uploader
+  # Error Messages
+  "Unable to process response: %s": "غير قادر على معالجة الرد: %s"
+  "Error: Unable to upload the file": "خطأ: غير قادر على رفع الملف"
+  "Malformed response from server": "استجابة من الخادم متلوفة"
+  "Too large": "كبير جدا"
+  "Unsupported format": "تنسيق غير مدعوم"
+  # Statuses
+  "Processing...": "معالجة..."
+  "Uploading...": "رفع..."
+  "Aborted": "ملغى"
+  "Successfully uploaded...": "تم الرفع بنجاح..."
+  "Name: %s": "اسم: %s"
+  "Size: %s": "حجم: %s"
+  "Type: %s": "نوع: %s"
+
+  # Statusbar
+  "Path:": "مسار:"
+
+
+  # ## HTML / Template Strings
+
+  # ### Modals
+  # Insert Link Modal (link.html)
+  "Link Content": "محتوى الرابط"
+  "Standard Links": "رابط قياسى"
+  "URL": "عنوان"
+  "Index / Bookmark Links": "روابط فهرس / الإشارة المرجعية"
+  "Existing Links": "الروابط الموجودة"
+  "Bookmark": "الإشارة المرجعية"
+  "Options": "خيارات"
+  "Link Target": "هدف الرابط"
+  "Self (the same window or tab)": "الذاتية (نفس النافذة أو التبويب)"
+  "Blank (a new window or tab)": "فارغة (نافذة جديدة أو علامة التبويب)"
+  "Top (removes any frames)": "أعلى (يزيل أي إطارات)"
+  "Popup Window (javascript new window popup)": "نافذة منبثقة (جافا سكريبت نافذة منبثقة جديد)"
+  "Popup Width": "عرض  النافذة المنبثقة"
+  "Popup Height": "طول  النافذة المنبثقة"
+
+  # Insert Media Modal (media.html)
+  "Images": "صور"
+  "Videos": "فيديو"
+  "YouTube URL": "رابط يوتيوب"
+  "Vimeo URL": "رابط فيميو"
+  "Alignment": "المحاذاة"
+  "None": "لا شيء"
+  "Left": "يسار"
+  "Right": "يمين"
+  "Top": "أعلى"
+  "Middle": "وسط"
+  "Bottom": "أسفل"
+  "Absolute Middle": "أوسط مطلق"
+  "Absolute Bottom": "أسفل مطلق"
+  "Width": "عرض"
+  "Height": "ارتفاع"
+  "Insert Media": "إدراج ملف ميديا"
+
+  # Insert Table Modal (table.html)
+  "Rows": "صفوف"
+  "Add Before": "إضافة قبل"
+  "Add After": "إضافة بعد"
+  "Remove": "حذف"
+  "Columns": "أعمدة"
+  "Row Span": "إمتداد الصف"
+  "Column Span": "إمتداد العمود"
+  "Border": "الحدود"
+  "Spacing": "تباعد"
+
+  # HTML Editor Modal (htmleditor.html)
+  "HTML Editor": "HTML محرر"
+  "Save and Replace": "حفظ واستبدال"
+
+  # ### Dialogs / Etc.
+  # Color Palettes (forecolor.html, backcolor.html)
+  "Last Color Picked": "التقطت آخر لون"
+
+  # Block Format Select (formatblock.html)
+  "Heading 1": "العنوان 1"
+  "Heading 2": "العنوان 2"
+  "Heading 3": "العنوان 3"
+  "Heading 4": "العنوان 4"
+  "Heading 5": "العنوان 5"
+  "Heading 6": "العنوان 6"
+  "Paragraph": "فقرة"
+  "Blockquote": "قتباس فقرة"
+  "Formatted": "منسقة"
+
+  # About Mercury Panel (about.html)
+  "Project Home": "صفحة المشروع"
+  "Project Source": "مصدر المشروع"
+
+  # ### Demo / Placeholder / Defaults
+  "The history panel is expected to be implemented with a server back end.  Since this is a demo, we didn't include it.": "لوحة التواريخ متوقع أن تكن مبرمجة. بما أن هد نسخة تجربية فهى غير محتواه."
+
+  "The notes panel is expected to be implemented with a server back end.  Since this is a demo, we didn't include it.": "لوحة الملاحظات متوقع أن تكن مبرمجة. بما أن هد نسخة تجربية فهى غير محتواه"
+
+  "Snippet Name": "اسم قصاصة"
+  "A one or two line long description of what this snippet does.": "وصف سطر واحد أو اثنين عما تفعل هذه القصاصة."
+
+  "First Name": "اﻷسم اﻷول"
+  "Favorite Beer": "المفضلة"
+  "Insert Snippet": "إدراج قصاصة"
+

data/app/assets/javascripts/mercury/locales/da.locale.js.coffee

@@ -0,0 +1,208 @@
+<<<<<<< HEAD:vendor/assets/javascripts/mercury/locales/da.locale.js.coffee
+=======
+Mercury.I18n['da'] =
+  # ## Javascript Strings
+
+  # ### Default Configuration
+  "Save": "Gem"
+  "Save this page": "Gem denne side"
+  "Preview": "Forhåndsvisning"
+  "Preview this page": "Forhåndsvis denne side"
+  "Undo": "Fortryd"
+  "Undo your last action": "Fortryd din sidste hændelse"
+  "Redo": "Gentag"
+  "Redo your last action": "Gentag din sidste hændelse"
+  "Link": "Link"
+  "Insert Link": "Indsæt link"
+  "Media": "Media"
+  "Insert Media (images and videos)": "Indsæt media (billeder og videoer)"
+  "Table": "Tabel"
+  "Insert Table": "Indsæt Tabel"
+  "Character": "Tegn"
+  "Special Characters": "Specialtegn"
+  "Snippet": "Snippet"
+  "Snippet Panel": "Snippetpanel"
+  "History": "Historie"
+  "Page Version History": "Sidens versionshistorik"
+  "Notes": "Noter"
+  "Page Notes": "Sidenoter"
+  "Style": "Stil"
+  "Block Format": "Blokformat"
+  "Background Color": "Baggrundsfarve"
+  "Text Color": "Tekstfarve"
+  "Bold": "Fed"
+  "Italicize": "Kursiv"
+  "Overline": "Overstreg"
+  "Strikethrough": "Gennemstreg"
+  "Underline": "Understreg"
+  "Subscript": "Sænket skrift"
+  "Superscript": "Hævet skrift"
+  "Align Left": "Venstrejusteret"
+  "Center": "Centreret"
+  "Align Right": "Højrejusteret"
+  "Justify Full": "Lige margener"
+  "Unordered List": "Usorteret liste"
+  "Numbered List": "Nummereret liste"
+  "Decrease Indentation": "Formindsk indrykning"
+  "Increase Indentation": "Forøg indrykning"
+  "Insert Table Row": "Indsæt tabelrække"
+  "Insert a table row before the cursor": "Indsæt en tabelrække før pegeren"
+  "Insert a table row after the cursor": "Indsæt en tabelrække efter pegeren"
+  "Delete Table Row": "Slet tabelrække"
+  "Delete this table row": "Slet denne tabelrække"
+  "Insert Table Column": "Indsæt tabelkolonne"
+  "Insert a table column before the cursor": "Indsæt en tabelkolonne før pegeren"
+  "Insert a table column after the cursor": "Indsæt en tabelkolonne efter pegeren"
+  "Delete Table Column": "Slet tabelkolonne"
+  "Delete this table column": "Slet denne tabelkolonne"
+  "Increase Cell Columns": "Forøg cellekolonner"
+  "Decrease Cell Columns": "Formindsk cellekolonner"
+  "Increase Cell Rows": "Forøg cellerækker"
+  "Decrease Cell Rows": "Formindsk cellerækker"
+  "Horizontal Rule": "Vandret linje"
+  "Insert a horizontal rule": "Indsæt en vandret linje"
+  "Remove Formatting": "Fjern formatering"
+  "Remove formatting for the selection": "Fjern formatering fra markeringen"
+  "Edit HTML": "Rediger HTML"
+  "Edit the HTML content": "Rediger HTML-indholdet"
+  "Edit Snippet Settings": "Rediger snippetindstillinger"
+  "Remove Snippet": "Fjern snippet"
+
+  # ### General
+  # Error Messages
+  "Mercury.Regions.%s is unsupported in this client. Supported browsers are %s.": "Mercury.Regions.%s er ikke understøttet i denne browser. Understøttede browsere er %s."
+  "Mercury.PageEditor can only be instantiated once.": "Mercury.PageEditor kan kun blive instantieret én gang."
+  "Opera isn't a fully supported browser, your results may not be optimal.": "Opera er ikke en fuldt ud understøttet. Dine resultater kan derfor være uoptimale."
+  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PageEditor kunne ikke starte: %s\n\n Prøv venligst at opdatere siden."
+  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "Regionstype er forkert formateret. Enten blev ingen datatype angivet, ellers er \"%s\" ukendt for \"%s\"regionen."
+  "Mercury was unable to save to the url: %s": "Mercury var ikke i stand til at gemme til addressen: %s"
+  "invalid": "ugyldig"
+  "can't be blank": "kan ikke være tomt"
+  # Confirmations
+  "You have unsaved changes.  Are you sure you want to leave without saving them first?": "Du har ændringer der ikke er blevet gemt. Er du sikker på, at du vil forlade siden uden først at gemme dem?"
+
+  # ### Toolbar / Buttons
+  # Error Messages
+  "Unknown button type \"%s\" used for the \"%s\" button.": "Ukendt knaptype \"%s\" anvendt for \"%s\"knappen."
+  "Unknown button structure -- please provide an array, object, or string for \"%s\".": "Ukendt knappestruktur -- Angiv venligst et array, objekt eller en streng for \"%s\"."
+
+  # ### Modals / Dialogs / Etc.
+  # Error Messages
+  "Mercury was unable to load %s for the \"%s\" dialog.": "Mercury kunne ikke indlæse %s for \"%s\"dialogen."
+  "Mercury was unable to load %s for the lightview.": "Mercury kunne ikke indlæse %s for lightview."
+  "Mercury was unable to load %s for the modal.": "Mercury kunne ikke indlæse %s for denna modal."
+
+  # ### Snippets
+  # Error Messages
+  "Error loading the preview for the \"%s\" snippet.": "Fejl ved indlæsning af forhåndsvisningen for \"%s\"snippeten."
+  # Misc
+  "Snippet Options": "Snippetindstillinger"
+
+  # ### Uploader
+  # Error Messages
+  "Unable to process response: %s": "Kunne ikke forarbejde svar: %s"
+  "Error: Unable to upload the file": "Fejl: Kunne ikke uploade filen"
+  "Malformed response from server": "Deform svar fra server"
+  "Too large": "For stor"
+  "Unsupported format": "Formatet er ikke understøttet"
+  # Statuses
+  "Processing...": "Forarbejder..."
+  "Uploading...": "Uploader..."
+  "Aborted": "Afbrudt"
+  "Successfully uploaded...": "Upload færdig..."
+  "Name: %s": "Navn: %s"
+  "Size: %s": "Størrelse: %s"
+  "Type: %s": "Type: %s"
+
+  # Statusbar
+  "Path:": "Sti:"
+
+
+  # ## HTML / Template Strings
+
+  # ### Modals
+  # Insert Link Modal (link.html)
+  "Link Content": "Link indhold"
+  "Standard Links": "Standard links"
+  "URL": "URL"
+  "Index / Bookmark Links": "Indeks- / bogmærkelinks"
+  "Existing Links": "Eksisterende links"
+  "Bookmark": "Bogmærke"
+  "Options": "Indstillinger"
+  "Link Target": "Link Target"
+  "Self (the same window or tab)": "Self (det samme vindue eller fane)"
+  "Blank (a new window or tab)": "Blank (et nyt vindue eller fane)"
+  "Top (removes any frames)": "Top (fjerner eventuelle rammer)"
+  "Popup Window (javascript new window popup)": "Popupvindue (JavaScript nyt vindue popup)"
+  "Popup Width": "Bredde for popup"
+  "Popup Height": "Højde for popup"
+
+  # Insert Media Modal (media.html)
+  "Images": "Billeder"
+  "Videos": "Videoer"
+  "YouTube URL": "YouTube-URL"
+  "Vimeo URL": "Vimeo-URL"
+  "Alignment": "Justering"
+  "None": "Ingen"
+  "Left": "Venstre"
+  "Right": "Højre"
+  "Top": "Top"
+  "Middle": "Midt"
+  "Bottom": "Bund"
+  "Absolute Middle": "Absolut midte"
+  "Absolute Bottom": "Absolut bund"
+  "Width": "Bredde"
+  "Height": "Højde"
+  "Insert Media": "Indsæt media"
+
+  # Insert Table Modal (table.html)
+  "Rows": "Rækker"
+  "Add Before": "Tilføj før"
+  "Add After": "Tilføj efter"
+  "Remove": "Fjern"
+  "Columns": "Kolonner"
+  "Row Span": "Rækkevidde"
+  "Column Span": "Kolonnevidde"
+  "Border": "Ramme"
+  "Spacing": "Mellemrum"
+
+  # HTML Editor Modal (htmleditor.html)
+  "HTML Editor": "HTML-editor"
+  "Save and Replace": "Gem og erstat"
+
+  # ### Dialogs / Etc.
+  # Color Palettes (forecolor.html, backcolor.html)
+  "Last Color Picked": "Sidste valgte farve"
+
+  # Block Format Select (formatblock.html)
+  "Heading 1": "Rubrik 1"
+  "Heading 2": "Rubrik 2"
+  "Heading 3": "Rubrik 3"
+  "Heading 4": "Rubrik 4"
+  "Heading 5": "Rubrik 5"
+  "Heading 6": "Rubrik 6"
+  "Paragraph": "Paragraf"
+  "Blockquote": "Citattekst"
+  "Formatted": "Formateret"
+
+  # About Mercury Panel (about.html)
+  "Project Home": "Projektets hjemmeside"
+  "Project Source": "Projektets kildekode"
+
+  # ### Demo / Placeholder / Defaults
+  "The history panel is expected to be implemented with a server back end.  Since this is a demo, we didn't include it.": "Historikpanelet forventes at være implementeret med en server back-end. Eftersom dette er en demo så inkluderede vi den ikke."
+
+  "The notes panel is expected to be implemented with a server back end.  Since this is a demo, we didn't include it.": "Notepanelet forventes at være implementeret med en server back-end. Eftersom dette er en demo så inkluderede vi den ikke."
+
+  "Snippet Name": "Snippetnavn"
+  "A one or two line long description of what this snippet does.": "En eller to linjers lang beskrivelse om hvad denne snippet gør."
+
+  "First Name": "Fornavn"
+  "Favorite Beer": "Favorit øl"
+  "Insert Snippet": "Indsæt snippet"
+
+
+  # ## Custom Regional Overrides (eg. en-US)
+  _US_:
+    "Save": "Gem"
+>>>>>>> upstream/master:app/assets/javascripts/mercury/locales/da.locale.js.coffee