diff options
| author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
|---|---|---|
| committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
| commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
| tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js | |
| parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
| parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) | |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js')
| -rw-r--r-- | program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js deleted file mode 100644 index 790050a70..000000000 --- a/program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js +++ /dev/null @@ -1 +0,0 @@ -tinyMCE.addI18n('gl.emotions_dlg',{cry:"Chora",cool:"Guay",desc:"Emoticones",title:"Insertar emoticon",yell:"Anoxado",wink:"Gui\u00f1o",undecided:"Indeciso","tongue_out":"Canso",surprised:"Sorprendido",smile:"Sorriso",sealed:"Selado","money_mouth":"Cartos",laughing:"Risa",kiss:"Beso",innocent:"Inocente",frown:"Triste","foot_in_mouth":"A que dixen",embarassed:"Vergo\u00f1a"});
\ No newline at end of file |