Kaynağa Gözat

Merge branch 'master' into t/ckeditor5/1655

Kamil Piechaczek 6 yıl önce
ebeveyn
işleme
3c9cd2bba2

+ 1 - 1
packages/ckeditor5-ckfinder/.eslintrc.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* eslint-env node */
 /* eslint-env node */

+ 1 - 5
packages/ckeditor5-ckfinder/.travis.yml

@@ -1,12 +1,8 @@
 sudo: required
 sudo: required
 dist: trusty
 dist: trusty
 addons:
 addons:
+  chrome: stable
   firefox: latest
   firefox: latest
-  apt:
-    sources:
-    - google-chrome
-    packages:
-    - google-chrome-stable
 language: node_js
 language: node_js
 node_js:
 node_js:
 - '8'
 - '8'

+ 8 - 0
packages/ckeditor5-ckfinder/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 Changelog
 =========
 =========
 
 
+## [11.0.1](https://github.com/ckeditor/ckeditor5-ckfinder/compare/v11.0.0...v11.0.1) (2019-04-10)
+
+### Other changes
+
+* Optimized icons. ([122d047](https://github.com/ckeditor/ckeditor5-ckfinder/commit/122d047))
+* Updated translations. ([5b26349](https://github.com/ckeditor/ckeditor5-ckfinder/commit/5b26349)) 
+
+
 ## [11.0.0](https://github.com/ckeditor/ckeditor5-ckfinder/compare/v10.0.0...v11.0.0) (2019-02-28)
 ## [11.0.0](https://github.com/ckeditor/ckeditor5-ckfinder/compare/v10.0.0...v11.0.0) (2019-02-28)
 
 
 ### Other changes
 ### Other changes

+ 1 - 1
packages/ckeditor5-ckfinder/docs/_snippets/features/build-ckfinder-source.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* globals window */
 /* globals window */

+ 1 - 1
packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder-options.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* globals ClassicEditor, console, window, document */
 /* globals ClassicEditor, console, window, document */

+ 1 - 1
packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder-upload-only.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* globals ClassicEditor, console, window, document */
 /* globals ClassicEditor, console, window, document */

+ 1 - 1
packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* globals ClassicEditor, console, window, document */
 /* globals ClassicEditor, console, window, document */

+ 3 - 3
packages/ckeditor5-ckfinder/lang/translations/de.po

@@ -22,15 +22,15 @@ msgstr "Bild oder Datei einfügen"
 
 
 msgctxt "Error message displayed when inserting a resized version of an image failed."
 msgctxt "Error message displayed when inserting a resized version of an image failed."
 msgid "Could not obtain resized image URL."
 msgid "Could not obtain resized image URL."
-msgstr ""
+msgstr "Die URL des angepassten Bildes konnte nicht abgerufen werden."
 
 
 msgctxt "Title of a notification displayed when inserting a resized version of an image failed."
 msgctxt "Title of a notification displayed when inserting a resized version of an image failed."
 msgid "Selecting resized image failed"
 msgid "Selecting resized image failed"
-msgstr ""
+msgstr "Das angepasste Bild konnte nicht ausgewählt werden."
 
 
 msgctxt "Error message displayed when an image cannot be inserted at the current position."
 msgctxt "Error message displayed when an image cannot be inserted at the current position."
 msgid "Could not insert image at the current position."
 msgid "Could not insert image at the current position."
-msgstr ""
+msgstr "Das Bild konnte an der aktuellen Position nicht eingefügt werden."
 
 
 msgctxt "Title of a notification displayed when an image cannot be inserted at the current position."
 msgctxt "Title of a notification displayed when an image cannot be inserted at the current position."
 msgid "Inserting image failed"
 msgid "Inserting image failed"

+ 37 - 0
packages/ckeditor5-ckfinder/lang/translations/es.po

@@ -0,0 +1,37 @@
+# Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+#
+#                                     !!! IMPORTANT !!!
+#
+#         Before you edit this file, please keep in mind that contributing to the project
+#                translations is possible ONLY via the Transifex online service.
+#
+#         To submit your translations, visit https://www.transifex.com/ckeditor/ckeditor5.
+#
+#                   To learn more, check out the official contributor's guide:
+#     https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html
+#
+msgid ""
+msgstr ""
+"Language-Team: Spanish (https://www.transifex.com/ckeditor/teams/11143/es/)\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Toolbar button tooltip for inserting an image or file via a CKFinder file browser."
+msgid "Insert image or file"
+msgstr "Insertar imagen o archivo"
+
+msgctxt "Error message displayed when inserting a resized version of an image failed."
+msgid "Could not obtain resized image URL."
+msgstr "No se puede acceder a la URL de la imagen redimensionada"
+
+msgctxt "Title of a notification displayed when inserting a resized version of an image failed."
+msgid "Selecting resized image failed"
+msgstr "Fallo eligiendo imagen redimensionada"
+
+msgctxt "Error message displayed when an image cannot be inserted at the current position."
+msgid "Could not insert image at the current position."
+msgstr "No se puede insertar una imagen en la posición actual"
+
+msgctxt "Title of a notification displayed when an image cannot be inserted at the current position."
+msgid "Inserting image failed"
+msgstr "Error insertando imagen"

+ 1 - 1
packages/ckeditor5-ckfinder/lang/translations/sr-latn.po

@@ -12,7 +12,7 @@
 #
 #
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
-"Language-Team: Serbian (Latin) (https://www.transifex.com/ckeditor/teams/11143/sr%40latin/)\n"
+"Language-Team: Serbian (Latin) (https://www.transifex.com/ckeditor/teams/11143/sr@latin/)\n"
 "Language: sr@latin\n"
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 

+ 11 - 11
packages/ckeditor5-ckfinder/package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "@ckeditor/ckeditor5-ckfinder",
   "name": "@ckeditor/ckeditor5-ckfinder",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "description": "CKFinder integration for CKEditor 5.",
   "description": "CKFinder integration for CKEditor 5.",
   "keywords": [
   "keywords": [
     "ckeditor",
     "ckeditor",
@@ -10,18 +10,18 @@
     "ckeditor5-plugin"
     "ckeditor5-plugin"
   ],
   ],
   "dependencies": {
   "dependencies": {
-    "@ckeditor/ckeditor5-adapter-ckfinder": "^11.0.0",
-    "@ckeditor/ckeditor5-core": "^12.0.0",
-    "@ckeditor/ckeditor5-ui": "^12.0.0"
+    "@ckeditor/ckeditor5-adapter-ckfinder": "^11.0.1",
+    "@ckeditor/ckeditor5-core": "^12.1.0",
+    "@ckeditor/ckeditor5-ui": "^12.1.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
-    "@ckeditor/ckeditor5-editor-classic": "^12.0.0",
-    "@ckeditor/ckeditor5-clipboard": "^11.0.0",
-    "@ckeditor/ckeditor5-engine": "^13.0.0",
-    "@ckeditor/ckeditor5-image": "^13.0.0",
-    "@ckeditor/ckeditor5-link": "^11.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^11.0.0",
-    "@ckeditor/ckeditor5-utils": "^12.0.0",
+    "@ckeditor/ckeditor5-editor-classic": "^12.1.0",
+    "@ckeditor/ckeditor5-clipboard": "^11.0.1",
+    "@ckeditor/ckeditor5-engine": "^13.1.0",
+    "@ckeditor/ckeditor5-image": "^13.0.1",
+    "@ckeditor/ckeditor5-link": "^11.0.1",
+    "@ckeditor/ckeditor5-paragraph": "^11.0.1",
+    "@ckeditor/ckeditor5-utils": "^12.1.0",
     "eslint": "^5.5.0",
     "eslint": "^5.5.0",
     "eslint-config-ckeditor5": "^1.0.11",
     "eslint-config-ckeditor5": "^1.0.11",
     "husky": "^1.3.1",
     "husky": "^1.3.1",

+ 1 - 1
packages/ckeditor5-ckfinder/src/ckfinder.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /**
 /**

+ 1 - 1
packages/ckeditor5-ckfinder/src/ckfindercommand.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* global window */
 /* global window */

+ 1 - 1
packages/ckeditor5-ckfinder/src/ckfinderediting.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /**
 /**

+ 1 - 1
packages/ckeditor5-ckfinder/src/ckfinderui.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /**
 /**

+ 1 - 1
packages/ckeditor5-ckfinder/tests/ckfinder.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';

+ 1 - 1
packages/ckeditor5-ckfinder/tests/ckfindercommand.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* global window */
 /* global window */

+ 1 - 1
packages/ckeditor5-ckfinder/tests/ckfinderediting.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 import Command from '@ckeditor/ckeditor5-core/src/command';
 import Command from '@ckeditor/ckeditor5-core/src/command';

+ 1 - 1
packages/ckeditor5-ckfinder/tests/ckfinderui.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* global window */
 /* global window */

+ 1 - 1
packages/ckeditor5-ckfinder/tests/manual/ckfinder.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* globals console, window, document */
 /* globals console, window, document */

+ 1 - 1
packages/ckeditor5-ckfinder/theme/icons/browse-files.svg

@@ -1 +1 @@
-<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M11.627 16.5a3.496 3.496 0 0 1 0 0zm5.873-.196a3.484 3.484 0 0 1 0 0zm0-7.001V8h-13v8.5h4.341c.191.54.457 1.044.785 1.5H2a1.5 1.5 0 0 1-1.5-1.5v-13A1.5 1.5 0 0 1 2 2h4.5a1.5 1.5 0 0 1 1.06.44L9.122 4H16a1.5 1.5 0 0 1 1.5 1.5v1A1.5 1.5 0 0 1 19 8v2.531a6.027 6.027 0 0 0-1.5-1.228zM16 6.5v-1H8.5l-2-2H2v13h1V8a1.5 1.5 0 0 1 1.5-1.5H16z"/><path d="M14.5 19.5a5 5 0 1 1 0-10 5 5 0 0 1 0 10zM15 14v-2h-1v2h-2v1h2v2h1v-2h2v-1h-2z"/></svg>
+<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M11.627 16.5zm5.873-.196zm0-7.001V8h-13v8.5h4.341c.191.54.457 1.044.785 1.5H2a1.5 1.5 0 0 1-1.5-1.5v-13A1.5 1.5 0 0 1 2 2h4.5a1.5 1.5 0 0 1 1.06.44L9.122 4H16a1.5 1.5 0 0 1 1.5 1.5v1A1.5 1.5 0 0 1 19 8v2.531a6.027 6.027 0 0 0-1.5-1.228zM16 6.5v-1H8.5l-2-2H2v13h1V8a1.5 1.5 0 0 1 1.5-1.5H16z"/><path d="M14.5 19.5a5 5 0 1 1 0-10 5 5 0 0 1 0 10zM15 14v-2h-1v2h-2v1h2v2h1v-2h2v-1h-2z"/></svg>