Skip to content

Commit

Permalink
Merge pull request #615 from ckeditor/t/584
Browse files Browse the repository at this point in the history
Font options are not toggleable any longer.
  • Loading branch information
f1ames authored Jul 31, 2017
2 parents 6ae9c49 + 18cb926 commit ef464ec
Show file tree
Hide file tree
Showing 80 changed files with 388 additions and 95 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
New Features:

* [#607](https://github.com/ckeditor/ckeditor-dev/issues/607): Manually inserted hex color is prefixed with hash tag if needed. It ensures a valid hex color is used when setting table cell border or background color via [Color Dialog](http://ckeditor.com/addon/colordialog) window.
* [#584](https://github.com/ckeditor/ckeditor-dev/issues/584): [Font size and Family](http://ckeditor.com/addon/font) and [Format](http://ckeditor.com/addon/format) drop-downs are not toggleable anymore. Default option to reset styles added.

## CKEditor 4.7.1

Expand Down
1 change: 1 addition & 0 deletions dev/langtool/meta/ckeditor.core/meta.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ common.keyboard.36 = Label for the "Home" key.
common.keyboard.46 = Label for the "Delete" key.
common.keyboard.224 = Label for the "Command" key.
common.keyboardShortcut = ARIA message for keyboard shortcuts.
common.optionDefault = Label for "(Default)" option in drop-down text-styling menus. Using such option restores default styling.
4 changes: 3 additions & 1 deletion lang/af.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'af' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Sleutel kombenasie'
keyboardShortcut: 'Sleutel kombenasie',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'ar' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/az.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'az' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Qısayol düymələri'
keyboardShortcut: 'Qısayol düymələri',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/bg.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'bg' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/bn.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'bn' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/bs.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'bs' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/ca.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'ca' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'cs' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Klávesová zkratka'
keyboardShortcut: 'Klávesová zkratka',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'cy' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/da.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'da' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Tastatur genvej'
keyboardShortcut: 'Tastatur genvej',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/de-ch.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ CKEDITOR.lang[ 'de-ch' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'de' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Tastaturkürzel'
keyboardShortcut: 'Tastaturkürzel',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/el.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'el' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Συντόμευση πληκτρολογίου'
keyboardShortcut: 'Συντόμευση πληκτρολογίου',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/en-au.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'en-au' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/en-ca.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'en-ca' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/en-gb.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'en-gb' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'en' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut'
keyboardShortcut: 'Keyboard shortcut',

optionDefault: 'Default'
}
};
4 changes: 3 additions & 1 deletion lang/eo.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'eo' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Fulmoklavo'
keyboardShortcut: 'Fulmoklavo',

optionDefault: 'Default' // MISSING
}
};
8 changes: 6 additions & 2 deletions lang/es-mx.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

// MISSING
/**
* @fileOverview
*/

/**#@+
@type String
Expand Down Expand Up @@ -109,6 +111,8 @@ CKEDITOR.lang[ 'es-mx' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Atajo de teclado'
keyboardShortcut: 'Atajo de teclado',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'es' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/et.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'et' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/eu.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'eu' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/fa.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'fa' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/fi.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'fi' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/fo.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'fo' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/fr-ca.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'fr-ca' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'fr' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Raccourci clavier'
keyboardShortcut: 'Raccourci clavier',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/gl.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'gl' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Atallo de teclado'
keyboardShortcut: 'Atallo de teclado',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/gu.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'gu' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/he.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'he' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/hi.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'hi' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/hr.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'hr' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Prečica na tipkovnici'
keyboardShortcut: 'Prečica na tipkovnici',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/hu.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'hu' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Gyorsbillentyű'
keyboardShortcut: 'Gyorsbillentyű',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/id.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ CKEDITOR.lang[ 'id' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Pintasan Keyboard'
keyboardShortcut: 'Pintasan Keyboard',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/is.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'is' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Keyboard shortcut' // MISSING
keyboardShortcut: 'Keyboard shortcut', // MISSING

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/it.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'it' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'Scorciatoia da tastiera'
keyboardShortcut: 'Scorciatoia da tastiera',

optionDefault: 'Default' // MISSING
}
};
4 changes: 3 additions & 1 deletion lang/ja.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ CKEDITOR.lang[ 'ja' ] = {
},

// Prepended to ARIA labels with shortcuts.
keyboardShortcut: 'キーボードショートカット'
keyboardShortcut: 'キーボードショートカット',

optionDefault: 'Default' // MISSING
}
};
Loading

0 comments on commit ef464ec

Please sign in to comment.