wysiwyg-rails 1.2.2 → 1.2.3

data/app/assets/javascripts/langs/it.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['it'] = {
     "Strikethrough": "Barrato",
     "Font Size": "Dimensione Carattere",
     "Color": "Colore",
-    "Background Color": "Colore Sfondo",
-    "Text Color": "Colore Testo",
+    "Background": "Sfondo",
+    "Text": "Testo",
     "Format Block": "Formattazione",
     "Normal": "Normale",
     "Paragraph": "Paragrafo",
@@ -51,7 +51,6 @@ $.Editable.LANGS['it'] = {
     "Replace Image": "Sostituisci Immagine",
     "Remove Image": "Rimuovi Immagine",
     "Title": "Titolo",
-    "Insert image": "Inserisci Immagine",
     "Drop image": "Rilascia Immagine",
     "or click": "oppure fai click su",
     "or": "o",

data/app/assets/javascripts/langs/ja.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['ja'] = {
     "Strikethrough": "\u53d6\u308a\u6d88\u3057\u7dda",
     "Font Size": "\u30d5\u30a9\u30f3\u30c8\u30b5\u30a4\u30ba",
     "Color": "\u30ab\u30e9\u30fc",
-    "Background Color": "\u80cc\u666f\u8272",
-    "Text Color": "\u6587\u5b57\u306e\u8272",
+    "Background": "\u80cc\u666f",
+    "Text": "\u30c6\u30ad\u30b9\u30c8",
     "Format Block": "\u66f8\u5f0f",
     "Normal": "\u30ce\u30fc\u30de\u30eb",
     "Paragraph": "\u6bb5\u843d",
@@ -51,7 +51,6 @@ $.Editable.LANGS['ja'] = {
     "Replace Image": "\u753b\u50cf\u3092\u4ea4\u63db\u3057\u3066\u304f\u3060\u3055\u3044",
     "Remove Image": "\u753b\u50cf\u3092\u524a\u9664",
     "Title": "\u30bf\u30a4\u30c8\u30eb",
-    "Insert image": "\u753b\u50cf\u306e\u633f\u5165",
     "Drop image": "\u753b\u50cf\u3092\u30c9\u30ed\u30c3\u30d7",
     "or click": "\u307e\u305f\u306f\u30af\u30ea\u30c3\u30af",
     "or": "\u307e\u305f\u306f",

data/app/assets/javascripts/langs/ko.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['ko'] = {
     "Strikethrough": "\ucde8\uc18c\uc120",
     "Font Size": "\ud3f0\ud2b8 \ud06c\uae30",
     "Color": "\uc0c9",
-    "Background Color": "\ubc30\uacbd\uc0c9",
-    "Text Color": "\ubb38\uc790 \uc0c9\uae54",
+    "Background": "\ubc30\uacbd",
+    "Text": "\ud14d\uc2a4\ud2b8",
     "Format Block": "\ud3ec\ub9f7",
     "Normal": "\ud45c\uc900",
     "Paragraph": "\ub2e8\ub77d",
@@ -51,7 +51,6 @@ $.Editable.LANGS['ko'] = {
     "Replace Image": "\uc774\ubbf8\uc9c0 \uad50\uccb4",
     "Remove Image": "\uc774\ubbf8\uc9c0\ub97c \uc81c\uac70",
     "Title": "\uc81c\ubaa9",
-    "Insert image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785",
     "Drop image": "\uc774\ubbf8\uc9c0\ub97c \uc0ad\uc81c",
     "or click": "\ub610\ub294 \ud074\ub9ad",
     "or": "\ub610\ub294",

data/app/assets/javascripts/langs/me.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['me'] = {
     "Strikethrough": "Prekri\u017eano",
     "Font Size": "Veli\u010dina fonta",
     "Color": "Boja",
-    "Background Color": "Boja pozadine",
-    "Text Color": "Boja teksta",
+    "Background": "Pozadine",
+    "Text": "Teksta",
     "Format Block": "Formatiranje bloka",
     "Normal": "Normalno",
     "Paragraph": "Paragraf",
@@ -51,7 +51,6 @@ $.Editable.LANGS['me'] = {
     "Replace Image": "Zamijeni ilustraciju",
     "Remove Image": "Ukloni ilustraciju",
     "Title": "Naslov",
-    "Insert image": "Umetni ilustraciju",
     "Drop image": "Izbaci ilustraciju",
     "or click": "ili odaberi",
     "or": "ili",

data/app/assets/javascripts/langs/nb.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['nb'] = {
     "Strikethrough": "Gjennomstreket",
     "Font Size": "St\u00f8rrelse",
     "Color": "Farge",
-    "Background Color": "Bakgrunnsfarge",
-    "Text Color": "Tekstfarge",
+    "Background": "Bakgrunn",
+    "Text": "Tekst",
     "Format Block": "Stiler",
     "Normal": "Normal",
     "Paragraph": "Avsnitt",
@@ -51,7 +51,6 @@ $.Editable.LANGS['nb'] = {
     "Replace Image": "Bytt bilde",
     "Remove Image": "Fjern bilde",
     "Title": "Tittel",
-    "Insert image": "Sett inn bilde",
     "Drop image": "Slippe bilde",
     "or click": "eller klikk",
     "or": "eller",

data/app/assets/javascripts/langs/nl.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['nl'] = {
     "Strikethrough": "Doorhalen",
     "Font Size": "Letter grootte",
     "Color": "Kleur",
-    "Background Color": "Achtergrondkleur",
-    "Text Color": "Tekstkleur",
+    "Background": "Achtergrond",
+    "Text": "Tekst",
     "Format Block": "Opmaak",
     "Normal": "Normaal",
     "Paragraph": "Paragraaf",
@@ -51,7 +51,6 @@ $.Editable.LANGS['nl'] = {
     "Replace Image": "Vervang afbeelding",
     "Remove Image": "Afbeelding verwijderen",
     "Title": "Titel",
-    "Insert image": "Afbeelding invoegen",
     "Drop image": "Drop afbeelding",
     "or click": "of klik op",
     "or": "of",

data/app/assets/javascripts/langs/pl.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['pl'] = {
     "Strikethrough": "Przekre\u015blenie",
     "Font Size": "Rozmiar czcionki",
     "Color": "Kolor",
-    "Background Color": "Kolor t\u0142a",
-    "Text Color": "Kolor tekstu",
+    "Background": "T\u0142o",
+    "Text": "Tekstu",
     "Format Block": "Formaty",
     "Normal": "Normalny",
     "Paragraph": "Akapit",
@@ -51,7 +51,6 @@ $.Editable.LANGS['pl'] = {
     "Replace Image": "Wymie\u0144 zdj\u0119cie",
     "Remove Image": "Usu\u0144 zdj\u0119cie",
     "Title": "Tytu\u0142",
-    "Insert image": "Wstaw obrazek",
     "Drop image": "Upu\u015bci\u0107 obraz",
     "or click": "lub kliknij",
     "or": "lub",

data/app/assets/javascripts/langs/pt_br.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['pt_br'] = {
     "Strikethrough": "Riscar",
     "Font Size": "Tamanho",
     "Color": "Cor",
-    "Background Color": "Cor do fundo",
-    "Text Color": "Cor do texto",
+    "Background": "Fundo",
+    "Text": "Texto",
     "Format Block": "Formatos",
     "Normal": "Normal",
     "Paragraph": "Par\u00e1grafo",
@@ -51,7 +51,6 @@ $.Editable.LANGS['pt_br'] = {
     "Replace Image": "Substituir imagem",
     "Remove Image": "Remover imagem",
     "Title": "T\u00edtulo",
-    "Insert image": "Inserir imagem",
     "Drop image": "Arraste sua imagem aqui",
     "or click": "ou clique aqui",
     "or": "ou",

data/app/assets/javascripts/langs/pt_pt.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['pt_pt'] = {
     "Strikethrough": "Rasurado",
     "Font Size": "Tamanho da fonte",
     "Color": "Cor",
-    "Background Color": "Cor de fundo",
-    "Text Color": "Cor do texto",
+    "Background": "Fundo",
+    "Text": "Texto",
     "Format Block": "Formatos",
     "Normal": "Normal",
     "Paragraph": "Par\u00e1grafo",
@@ -51,7 +51,6 @@ $.Editable.LANGS['pt_pt'] = {
     "Replace Image": "Substituir imagem",
     "Remove Image": "Remover imagem",
     "Title": "T\u00edtulo",
-    "Insert image": "Inserir imagem",
     "Drop image": "Largue imagem",
     "or click": "ou clique em",
     "or": "ou",

data/app/assets/javascripts/langs/ro.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['ro'] = {
     "Strikethrough": "T\u0103iat",
     "Font Size": "Dimensiune font",
     "Color": "Culoare",
-    "Background Color": "Culoare fundal",
-    "Text Color": "Culoare text",
+    "Background": "Fundal",
+    "Text": "Text",
     "Format Block": "Formate",
     "Normal": "Normal",
     "Paragraph": "Paragraf",
@@ -51,7 +51,6 @@ $.Editable.LANGS['ro'] = {
     "Replace Image": "\u00cenlocuie\u015fte imaginea",
     "Remove Image": "\u0218terge imaginea",
     "Title": "Titlu",
-    "Insert image": "Inserare imagine",
     "Drop image": "Trage imagine",
     "or click": "sau f\u0103 click",
     "or": "sau",

data/app/assets/javascripts/langs/ru.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -9,16 +9,16 @@
 
 $.Editable.LANGS['ru'] = {
   translation: {
-    "Bold": "\u041f\u043e\u043b\u0443\u0436\u0438\u0440\u043d\u044b\u0439",
+    "Bold": "\u0416\u0438\u0440\u043d\u044b\u0439",
     "Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
     "Underline": "\u041f\u043e\u0434\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
     "Strikethrough": "\u0417\u0430\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
     "Font Size": "\u0420\u0430\u0437\u043c\u0435\u0440 \u0448\u0440\u0438\u0444\u0442\u0430",
     "Color": "\u0426\u0432\u0435\u0442",
-    "Background Color": "\u0426\u0432\u0435\u0442 \u0444\u043e\u043d\u0430",
-    "Text Color": "\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430",
+    "Background": "\u0424\u043e\u043d",
+    "Text": "\u0442\u0435\u043a\u0441\u0442",
     "Format Block": "\u0424\u043e\u0440\u043c\u0430\u0442",
-    "Normal": "\u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u044b\u0439",
+    "Normal": "\u041d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u044b\u0439",
     "Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
     "Code": "\u041a\u043e\u0434",
     "Quote": "\u0426\u0438\u0442\u0430\u0442\u0430",
@@ -28,7 +28,7 @@ $.Editable.LANGS['ru'] = {
     "Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
     "Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
     "Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-    "Block Style": "\u0411\u043b\u043e\u043a \u0441\u0442\u0438\u043b\u044c",
+    "Block Style": "\u0421\u0442\u0438\u043b\u044c \u0431\u043b\u043e\u043a\u0430",
     "Alignment": "\u0412\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
     "Align Left": "\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
     "Align Center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
@@ -38,47 +38,46 @@ $.Editable.LANGS['ru'] = {
     "Bulleted List": "\u041c\u0430\u0440\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
     "Indent Less": "\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
     "Indent More": "\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
-    "Select All": "\u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0432\u0441\u0435",
+    "Select All": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0432\u0441\u0435",
     "Insert Link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
     "Insert Image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
     "Insert Video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
     "Undo": "\u0412\u0435\u0440\u043d\u0443\u0442\u044c",
-    "Redo": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c",
+    "Redo": "\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c",
     "Show HTML": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c HTML",
-    "Float Left": "\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-    "Float None": "\u041d\u0435\u0442",
-    "Float Right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+    "Float Left": "\u041e\u0431\u0442\u0435\u043a\u0430\u043d\u0438\u0435 \u0441\u043f\u0440\u0430\u0432\u0430",
+    "Float None": "\u041d\u0435\u0442 \u043e\u0431\u0442\u0435\u043a\u0430\u043d\u0438\u044f",
+    "Float Right": "\u041e\u0431\u0442\u0435\u043a\u0430\u043d\u0438\u0435 \u0441\u043b\u0435\u0432\u0430",
     "Replace Image": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
     "Remove Image": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-    "Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-    "Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-    "Drop image": "\u0411\u0440\u043e\u0441\u044c\u0442\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+    "Title": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
+    "Drop image": "\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u0435 \u0441\u044e\u0434\u0430 \u0444\u0430\u0439\u043b",
     "or click": "\u0438\u043b\u0438 \u043d\u0430\u0436\u043c\u0438\u0442\u0435",
     "or": "\u0438\u043b\u0438",
     "Enter URL": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 URL",
-    "Please wait!": "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u043e\u0436\u0434\u0438\u0442\u0435!",
+    "Please wait!": "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430 \u043f\u043e\u0434\u043e\u0436\u0434\u0438\u0442\u0435!",
     "Are you sure? Image will be deleted.": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b? \u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0431\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043b\u0435\u043d\u043e.",
     "UNLINK": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
-    "Open in new tab": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0432 \u043d\u043e\u0432\u043e\u0439 \u0432\u043a\u043b\u0430\u0434\u043a\u0435",
-    "Type something": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0447\u0442\u043e\u002d\u043d\u0438\u0431\u0443\u0434\u044c",
+    "Open in new tab": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0432 \u043d\u043e\u0432\u043e\u0439 \u0432\u043a\u043b\u0430\u0434\u043a",
+    "Type something": "\u041d\u0430\u043f\u0438\u0448\u0438\u0442\u0435 \u0447\u0442\u043e\u002d\u043d\u0438\u0431\u0443\u0434\u044c",
     "Cancel": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c",
-    "OK": "\u041e\u043a",
-    "Manage images": "\u0434\u043b\u044f \u0440\u0430\u0431\u043e\u0442\u044b \u0441 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u043c\u0438",
-    "Delete": "\u0443\u0434\u0430\u043b\u044f\u0442\u044c",
+    "OK": "OK",
+    "Manage images": "\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u043c\u0438",
+    "Delete": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c",
     "Font Family": "\u0428\u0440\u0438\u0444\u0442",
-    "Insert Horizontal Line": "\u0412\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0443\u044e \u043b\u0438\u043d\u0438\u044e",
+    "Insert Horizontal Line": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0443\u044e \u043b\u0438\u043d\u0438\u044e",
     "Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
-    "Insert table": "\u0422\u0438\u043f \u0441\u0442\u0440\u043e\u043a\u0438",
+    "Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
     "Cell": "\u042f\u0447\u0435\u0439\u043a\u0430",
     "Row": "\u0421\u0442\u0440\u043e\u043a\u0430",
     "Column": "\u0421\u0442\u043e\u043b\u0431\u0435\u0446",
     "Delete table": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
-    "Insert cell before": "\u0412\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u044f\u0447\u0435\u0439\u043a\u0443 \u0434\u043e",
-    "Insert cell after": "\u0412\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u044f\u0447\u0435\u0439\u043a\u0443 \u043f\u043e\u0441\u043b\u0435",
+    "Insert cell before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0443 \u0434\u043e",
+    "Insert cell after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0443 \u043f\u043e\u0441\u043b\u0435",
     "Delete cell": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0443",
-    "Merge cells": "\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0438",
-    "Horizontal split": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u0435",
-    "Vertical split": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0440\u0430\u0441\u043a\u043e\u043b",
+    "Merge cells": "\u041e\u0431\u044a\u0435\u0434\u0435\u043d\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0438",
+    "Horizontal split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e",
+    "Vertical split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u043e",
     "Insert row above": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0441\u0442\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u0432\u0435\u0440\u0445\u0443",
     "Insert row below": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0441\u0442\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u043d\u0438\u0437\u0443",
     "Delete row": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",

data/app/assets/javascripts/langs/sr.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['sr'] = {
     "Strikethrough": "Precrtan",
     "Font Size": "Veli\u010dina fontova",
     "Color": "Boja",
-    "Background Color": "Boja pozadine",
-    "Text Color": "Boja tekst",
+    "Background": "Pozadine",
+    "Text": "Tekst",
     "Format Block": "Formatiranje bloka",
     "Normal": "Normalno",
     "Paragraph": "Paragraf",
@@ -51,7 +51,6 @@ $.Editable.LANGS['sr'] = {
     "Replace Image": "Zameni sliku",
     "Remove Image": "Ukloni sliku",
     "Title": "Naslov",
-    "Insert image": "Ubaci sliku",
     "Drop image": "Izbaci sliku",
     "or click": "ili odaberi",
     "or": "ili",

data/app/assets/javascripts/langs/sv.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['sv'] = {
     "Strikethrough": "Genomstruken",
     "Font Size": "Storlek",
     "Color": "F\u00e4rg",
-    "Background Color": "Bakgrundsf\u00e4rg",
-    "Text Color": "Textf\u00e4rg",
+    "Background": "Bakgrund",
+    "Text": "Text",
     "Format Block": "Format",
     "Normal": "Normal",
     "Paragraph": "Br\u00f6dtext",
@@ -51,7 +51,6 @@ $.Editable.LANGS['sv'] = {
     "Replace Image": "Ers\u00e4tt bild",
     "Remove Image": "Ta bort bild",
     "Title": "Titel",
-    "Insert image": "Infoga bild",
     "Drop image": "Sl\u00e4ppa bild",
     "or click": "eller klicka",
     "or": "eller",

data/app/assets/javascripts/langs/th.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['th'] = {
     "Strikethrough": "\u0e02\u0e35\u0e14\u0e17\u0e31\u0e1a",
     "Font Size": "\u0e02\u0e19\u0e32\u0e14\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23",
     "Color": "\u0e2a\u0e35",
-    "Background Color": "\u0e2a\u0e35\u0e1e\u0e37\u0e49\u0e19\u0e2b\u0e25\u0e31\u0e07",
-    "Text Color": "\u0e2a\u0e35\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
+    "Background": "\u0e1e\u0e37\u0e49\u0e19\u0e2b\u0e25\u0e31\u0e07",
+    "Text": "\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
     "Format Block": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
     "Normal": "\u0e1b\u0e01\u0e15\u0e34",
     "Paragraph": "\u0e22\u0e48\u0e2d\u0e2b\u0e19\u0e49\u0e32",
@@ -51,7 +51,6 @@ $.Editable.LANGS['th'] = {
     "Replace Image": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48\u0e20\u0e32\u0e1e",
     "Remove Image": "\u0e25\u0e1a\u0e20\u0e32\u0e1e",
     "Title": "\u0e0a\u0e37\u0e48\u0e2d\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07",
-    "Insert image": "\u0e41\u0e17\u0e23\u0e01\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
     "Drop image": "\u0e27\u0e32\u0e07\u0e20\u0e32\u0e1e",
     "or click": "\u0e2b\u0e23\u0e37\u0e2d\u0e04\u0e25\u0e34\u0e01\u0e17\u0e35\u0e48",
     "or": "\u0e2b\u0e23\u0e37\u0e2d",

data/app/assets/javascripts/langs/tr.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v1.2.2 (http://editor.froala.com)
+ * froala_editor v1.2.3 (http://editor.froala.com)
  * Copyright 2014-2014 Froala
  */
 
@@ -15,8 +15,8 @@ $.Editable.LANGS['tr'] = {
     "Strikethrough": "\u00dcst\u00fc \u00e7izili",
     "Font Size": "Yaz\u0131tipi B\u00fcy\u00fckl\u00fc\u011f\u00fc",
     "Color": "Rengi",
-    "Background Color": "Arkaplan rengi",
-    "Text Color": "Yaz\u0131 rengi",
+    "Background": "Arkaplan",
+    "Text": "Yaz\u0131",
     "Format Block": "Bi\u00e7imler",
     "Normal": "Normal",
     "Paragraph": "Paragraf",
@@ -51,7 +51,6 @@ $.Editable.LANGS['tr'] = {
     "Replace Image": "Resim de\u011fi\u015ftirmek",
     "Remove Image": "Resim kald\u0131r",
     "Title": "Ba\u015fl\u0131k",
-    "Insert image": "Resim ekle",
     "Drop image": "B\u0131rak resim",
     "or click": "ya da t\u0131klay\u0131n",
     "or": "veya",