Rebased ref, commits from common ancestor: commit 5634d95f5567475109c037fec5ab370aa73cdfd6 Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Sun Feb 23 12:08:36 2020 +0100 Commit: Tamás Zolnai <tamas.zol...@collabora.com> CommitDate: Sun Feb 23 13:53:47 2020 +0100
parallel-cypress: Let's make the pid file under workdir. Change-Id: Ib927b7d4c29c623de8cd4bf083843a7a6a7c9c2f diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 11f22a820..22c1e0271 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -7,7 +7,7 @@ WAIT_ON_BINARY = $(abs_builddir)/node_modules/wait-on/bin/wait-on GET_PORT_BINARY = $(abs_builddir)/node_modules/get-port-cli/cli.js NPM_INSTALLED = $(abs_builddir)/workdir/npm_installed -PID_FILE=$(abs_builddir)/loolwsd.pid +PID_FILE=$(abs_builddir)/workdir/loolwsd.pid DESKTOP_USER_AGENT = "cypress" DESKTOP_TEST_FOLDER = $(abs_srcdir)/integration_tests/desktop commit 3d9691efd83cf2b735a702f3dfebc2805da10fc8 Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Sun Feb 23 11:46:17 2020 +0100 Commit: Tamás Zolnai <tamas.zol...@collabora.com> CommitDate: Sun Feb 23 13:53:47 2020 +0100 parallel-cypress: Make sure that npm packages are not installed more times. When we build with more jobs. Change-Id: I1051825ec8db4ccc7e10bd4a599480a97334538d diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 70bea1c71..11f22a820 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -5,6 +5,7 @@ CYPRESS_BINARY = $(abs_builddir)/node_modules/cypress/bin/cypress ESLINT_BINARY = $(abs_builddir)/node_modules/eslint/bin/eslint.js WAIT_ON_BINARY = $(abs_builddir)/node_modules/wait-on/bin/wait-on GET_PORT_BINARY = $(abs_builddir)/node_modules/get-port-cli/cli.js +NPM_INSTALLED = $(abs_builddir)/workdir/npm_installed PID_FILE=$(abs_builddir)/loolwsd.pid @@ -161,8 +162,12 @@ NODE_BINS = \ $(WAIT_ON_BINARY) \ $(GET_PORT_BINARY) -$(NODE_BINS): +$(NODE_BINS): $(NPM_INSTALLED); + +$(NPM_INSTALLED): @npm install + @mkdir -p $(dir $(NPM_INSTALLED)) + @touch $(NPM_INSTALLED) endif commit 385d7c2ed0854c5b57ac6afb09b4071ec61d9b98 Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Sat Feb 22 11:48:33 2020 +0100 Commit: Tamás Zolnai <tamas.zol...@collabora.com> CommitDate: Sun Feb 23 13:53:16 2020 +0100 parallel-cypress: during parallel build don't write out execution line-by-line Because in this case, the output of the different threads will be mixed in the command line. For sequential build keep the original behavior. Change-Id: Ibf9bf7c6111f8b5b0cf188fab66b97dedd613c65 diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index d4a848a4c..70bea1c71 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -22,6 +22,7 @@ MOBILE_TRACK_FOLDER=$(abs_builddir)/workdir/track/mobile ALLOWED_PORTS = $(shell seq 9900 1 9980) KILL_COMMAND=pkill -F $(PID_FILE) || pkill --signal SIGKILL -F $(PID_FILE) +PARALLEL_BUILD = $(findstring jobserver,$(MAKEFLAGS)) if HAVE_LO_PATH MOBILE_TEST_FILES= \ @@ -129,27 +130,29 @@ define start_loolwsd endef define run_desktop_tests + @echo $(if $(1),"Running cypress desktop test: $(1)","Running cypress desktop tests...") @echo - @echo "Running cypress desktop tests..." - @echo - $(CYPRESS_BINARY) run --browser $(CHROME) \ + $(eval RUN_COMMAND = \ + $(CYPRESS_BINARY) run --browser $(CHROME) \ --config integrationFolder=$(DESKTOP_TEST_FOLDER),userAgent=$(DESKTOP_USER_AGENT) \ --headless \ --env DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT) \ $(if $(1), --spec=$(abs_dir)/integration_tests/desktop/$(1)) \ - || ($(KILL_COMMAND) && false) + || ($(KILL_COMMAND) && false)) + $(if $(PARALLEL_BUILD),@echo "`echo $(RUN_COMMAND) && $(RUN_COMMAND)`",$(RUN_COMMAND)) endef define run_mobile_tests + @echo $(if $(1),"Running cypress mobile test: $(1)","Running cypress mobile tests...") @echo - @echo "Running cypress mobile tests..." - @echo - $(CYPRESS_BINARY) run --browser $(CHROME) \ + $(eval RUN_COMMAND = \ + $(CYPRESS_BINARY) run --browser $(CHROME) \ --config integrationFolder=$(MOBILE_TEST_FOLDER),userAgent=$(MOBILE_USER_AGENT) \ --headless \ --env DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT) \ $(if $(1), --spec=$(abs_dir)/integration_tests/mobile/$(1)) \ - || ($(KILL_COMMAND) && false) + || ($(KILL_COMMAND) && false)) + $(if $(PARALLEL_BUILD),@echo "`echo $(RUN_COMMAND) && $(RUN_COMMAND)`",$(RUN_COMMAND)) endef NODE_BINS = \ commit 4863a4f9e2bca44a43f7e0ab2bba2fcdd054ba9d Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Sat Feb 22 10:42:49 2020 +0100 Commit: Tamás Zolnai <tamas.zol...@collabora.com> CommitDate: Sun Feb 23 13:52:52 2020 +0100 parallel-cypress: some cleanup around loolwsd server starting Change-Id: Ia762d9ae73a40ea9debf0b847bc93e8e9171284d diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 64f4563c2..d4a848a4c 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -57,7 +57,6 @@ check-local: $(MOBILE_TEST_FILES_DONE) $(DESKTOP_TEST_FILES_DONE) $(PID_FILE): @JAILS_PATH@ $(NODE_BINS) $(call run_JS_error_check) - $(eval FREE_PORT:=$(shell $(GET_PORT_BINARY) --host=127.0.0.1 $(ALLOWED_PORTS))) $(call start_loolwsd) $(MOBILE_TEST_FILES_DONE): $(PID_FILE) @@ -111,6 +110,7 @@ define run_JS_error_check endef define start_loolwsd + $(eval FREE_PORT:=$(shell $(GET_PORT_BINARY) --host=127.0.0.1 $(ALLOWED_PORTS))) @echo "Found available port for testing: $(FREE_PORT)" @echo @echo "Launching loolwsd..." @@ -120,9 +120,10 @@ define start_loolwsd --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \ --disable-ssl \ --o:admin_console.username=admin --o:admin_console.password=admin \ - --o:logging.file[@enable]=true --o:logging.level=trace > /dev/null 2>&1 \ + --o:logging.file[@enable]=true --o:logging.level=trace \ --port=$(FREE_PORT) \ - --pidfile=$(PID_FILE) & + --pidfile=$(PID_FILE) \ + > /dev/null 2>&1 & @$(WAIT_ON_BINARY) http://localhost:$(FREE_PORT) --timeout 60000 @echo endef commit 19c1e1b8a797664cd6a748904a9e57a77ef3404c Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Thu Feb 20 22:01:27 2020 +0100 Commit: Tamás Zolnai <tamas.zol...@collabora.com> CommitDate: Sun Feb 23 13:52:52 2020 +0100 parallel-cypress: initial parallelization - Run all spec files separately so we can run them parallel. - Use separate test files for all spec files. - Disable two tests which are failing while running in parallel. Change-Id: I521feeac6e1ac4c3d2c87e989c11d4231945e569 diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 48ec88ba4..64f4563c2 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -12,24 +12,63 @@ DESKTOP_USER_AGENT = "cypress" DESKTOP_TEST_FOLDER = $(abs_srcdir)/integration_tests/desktop DESKTOP_DATA_FOLDER = $(abs_srcdir)/data/desktop/ DESKTOP_WORKDIR = $(abs_builddir)/workdir/desktop/ +DESKTOP_TRACK_FOLDER=$(abs_builddir)/workdir/track/desktop MOBILE_USER_AGENT = "cypress mobile" MOBILE_TEST_FOLDER = $(abs_srcdir)/integration_tests/mobile MOBILE_DATA_FOLDER = $(abs_srcdir)/data/mobile/ MOBILE_WORKDIR = $(abs_builddir)/workdir/mobile/ +MOBILE_TRACK_FOLDER=$(abs_builddir)/workdir/track/mobile ALLOWED_PORTS = $(shell seq 9900 1 9980) -FREE_PORT=$(shell $(GET_PORT_BINARY) --host=127.0.0.1 $(ALLOWED_PORTS)) - KILL_COMMAND=pkill -F $(PID_FILE) || pkill --signal SIGKILL -F $(PID_FILE) if HAVE_LO_PATH -check-local: @JAILS_PATH@ $(NODE_BINS) +MOBILE_TEST_FILES= \ + calc/calc_focus_spec.js \ + impress/impress_focus_spec.js \ + writer/apply_font_spec.js \ + writer/apply_paragraph_properties_spec.js \ + writer/bottom_toolbar_spec.js \ + writer/focus_spec.js \ + writer/insert_field_spec.js \ + writer/insert_formatting_mark_spec.js \ + writer/insert_object_spec.js \ + writer/mobile_wizard_state_spec.js \ + writer/shape_properties_spec.js \ + writer/spellchecking_spec.js \ + writer/styles_spec.js \ + writer/table_properties_spec.js \ + writer/toolbar_spec.js + +DEKSTOP_TEST_FILES= \ + copy_paste_spec.js \ + example_desktop_test_spec.js \ + shape_operations_spec.js + +MOBILE_TEST_FILES_DONE= \ + $(foreach test_file,$(MOBILE_TEST_FILES),$(MOBILE_TRACK_FOLDER)/$(test_file).done) + +DESKTOP_TEST_FILES_DONE= \ + $(foreach test_file,$(DEKSTOP_TEST_FILES),$(DESKTOP_TRACK_FOLDER)/$(test_file).done) + +check-local: $(MOBILE_TEST_FILES_DONE) $(DESKTOP_TEST_FILES_DONE) + @$(KILL_COMMAND) || true + +$(PID_FILE): @JAILS_PATH@ $(NODE_BINS) $(call run_JS_error_check) + $(eval FREE_PORT:=$(shell $(GET_PORT_BINARY) --host=127.0.0.1 $(ALLOWED_PORTS))) $(call start_loolwsd) - $(call run_desktop_tests) - $(call run_mobile_tests) - @$(KILL_COMMAND) || true + +$(MOBILE_TEST_FILES_DONE): $(PID_FILE) + $(call run_mobile_tests,$(subst $(MOBILE_TRACK_FOLDER),,$(basename $@))) + @mkdir -p $(dir $@) + @touch $@ + +$(DESKTOP_TEST_FILES_DONE): $(PID_FILE) + $(call run_desktop_tests,$(subst $(DESKTOP_TRACK_FOLDER),,$(basename $@))) + @mkdir -p $(dir $@) + @touch $@ check-desktop: @JAILS_PATH@ $(NODE_BINS) $(call run_JS_error_check) diff --git a/cypress_test/data/desktop/simple.odt b/cypress_test/data/desktop/copy_paste.odt similarity index 100% rename from cypress_test/data/desktop/simple.odt rename to cypress_test/data/desktop/copy_paste.odt diff --git a/cypress_test/data/desktop/example.odt b/cypress_test/data/desktop/example.odt new file mode 100644 index 000000000..833aa18fa Binary files /dev/null and b/cypress_test/data/desktop/example.odt differ diff --git a/cypress_test/data/desktop/empty.odt b/cypress_test/data/desktop/shape_operations.odt similarity index 100% rename from cypress_test/data/desktop/empty.odt rename to cypress_test/data/desktop/shape_operations.odt diff --git a/cypress_test/data/mobile/calc/empty.ods b/cypress_test/data/mobile/calc/focus.ods similarity index 100% rename from cypress_test/data/mobile/calc/empty.ods rename to cypress_test/data/mobile/calc/focus.ods diff --git a/cypress_test/data/mobile/impress/empty.odp b/cypress_test/data/mobile/impress/focus.odp similarity index 100% rename from cypress_test/data/mobile/impress/empty.odp rename to cypress_test/data/mobile/impress/focus.odp diff --git a/cypress_test/data/mobile/writer/simple.odt b/cypress_test/data/mobile/writer/apply_font.odt similarity index 100% rename from cypress_test/data/mobile/writer/simple.odt rename to cypress_test/data/mobile/writer/apply_font.odt diff --git a/cypress_test/data/mobile/writer/apply_paragraph_properties.odt b/cypress_test/data/mobile/writer/apply_paragraph_properties.odt new file mode 100644 index 000000000..f7494e82f Binary files /dev/null and b/cypress_test/data/mobile/writer/apply_paragraph_properties.odt differ diff --git a/cypress_test/data/mobile/writer/bottom_toolbar.odt b/cypress_test/data/mobile/writer/bottom_toolbar.odt new file mode 100644 index 000000000..f7494e82f Binary files /dev/null and b/cypress_test/data/mobile/writer/bottom_toolbar.odt differ diff --git a/cypress_test/data/mobile/writer/empty.odt b/cypress_test/data/mobile/writer/focus.odt similarity index 100% rename from cypress_test/data/mobile/writer/empty.odt rename to cypress_test/data/mobile/writer/focus.odt diff --git a/cypress_test/data/mobile/writer/insert_field.odt b/cypress_test/data/mobile/writer/insert_field.odt new file mode 100644 index 000000000..f7494e82f Binary files /dev/null and b/cypress_test/data/mobile/writer/insert_field.odt differ diff --git a/cypress_test/data/mobile/writer/insert_formatting_mark.odt b/cypress_test/data/mobile/writer/insert_formatting_mark.odt new file mode 100644 index 000000000..f7494e82f Binary files /dev/null and b/cypress_test/data/mobile/writer/insert_formatting_mark.odt differ diff --git a/cypress_test/data/mobile/writer/insert_object.odt b/cypress_test/data/mobile/writer/insert_object.odt new file mode 100644 index 000000000..550752605 Binary files /dev/null and b/cypress_test/data/mobile/writer/insert_object.odt differ diff --git a/cypress_test/data/mobile/writer/mobile_wizard_state.odt b/cypress_test/data/mobile/writer/mobile_wizard_state.odt new file mode 100644 index 000000000..550752605 Binary files /dev/null and b/cypress_test/data/mobile/writer/mobile_wizard_state.odt differ diff --git a/cypress_test/data/mobile/writer/shape_properties.odt b/cypress_test/data/mobile/writer/shape_properties.odt new file mode 100644 index 000000000..550752605 Binary files /dev/null and b/cypress_test/data/mobile/writer/shape_properties.odt differ diff --git a/cypress_test/data/mobile/writer/spellcheck.odt b/cypress_test/data/mobile/writer/spellchecking.odt similarity index 100% rename from cypress_test/data/mobile/writer/spellcheck.odt rename to cypress_test/data/mobile/writer/spellchecking.odt diff --git a/cypress_test/data/mobile/writer/styles.odt b/cypress_test/data/mobile/writer/styles.odt new file mode 100644 index 000000000..f7494e82f Binary files /dev/null and b/cypress_test/data/mobile/writer/styles.odt differ diff --git a/cypress_test/data/mobile/writer/table_properties.odt b/cypress_test/data/mobile/writer/table_properties.odt new file mode 100644 index 000000000..550752605 Binary files /dev/null and b/cypress_test/data/mobile/writer/table_properties.odt differ diff --git a/cypress_test/data/mobile/writer/table.odt b/cypress_test/data/mobile/writer/table_properties2.odt similarity index 100% rename from cypress_test/data/mobile/writer/table.odt rename to cypress_test/data/mobile/writer/table_properties2.odt diff --git a/cypress_test/data/mobile/writer/toolbar.odt b/cypress_test/data/mobile/writer/toolbar.odt new file mode 100644 index 000000000..550752605 Binary files /dev/null and b/cypress_test/data/mobile/writer/toolbar.odt differ diff --git a/cypress_test/integration_tests/desktop/copy_paste_spec.js b/cypress_test/integration_tests/desktop/copy_paste_spec.js index 1f45bc0a7..326cb3297 100644 --- a/cypress_test/integration_tests/desktop/copy_paste_spec.js +++ b/cypress_test/integration_tests/desktop/copy_paste_spec.js @@ -4,7 +4,7 @@ var helper = require('../common/helper'); describe('Clipboard operations.', function() { beforeEach(function() { - helper.loadTestDoc('simple.odt'); + helper.loadTestDoc('copy_paste.odt'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/example_desktop_test_spec.js b/cypress_test/integration_tests/desktop/example_desktop_test_spec.js index 824656bd2..f709166f6 100644 --- a/cypress_test/integration_tests/desktop/example_desktop_test_spec.js +++ b/cypress_test/integration_tests/desktop/example_desktop_test_spec.js @@ -9,7 +9,7 @@ describe('Example test suit 1', function() { }); it('Example test case 1', function() { - helper.loadTestDoc('simple.odt'); + helper.loadTestDoc('example.odt'); // Select a text cy.get('#document-container').dblclick(); diff --git a/cypress_test/integration_tests/desktop/shape_operations_spec.js b/cypress_test/integration_tests/desktop/shape_operations_spec.js index 241af3a33..15869bfe4 100644 --- a/cypress_test/integration_tests/desktop/shape_operations_spec.js +++ b/cypress_test/integration_tests/desktop/shape_operations_spec.js @@ -9,7 +9,7 @@ describe('Shape operations', function() { }); it('Insert a simple shape.', function() { - helper.loadTestDoc('empty.odt'); + helper.loadTestDoc('shape_operations.odt'); // Scroll on the up toolbar cy.get('#toolbar-up .w2ui-scroll-right').click(); diff --git a/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js b/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js index 40b6a7c65..8d5cada69 100644 --- a/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js +++ b/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Calc focus tests', function() { beforeEach(function() { - helper.beforeAllMobile('empty.ods', 'calc'); + helper.beforeAllMobile('focus.ods', 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js index 9340a6111..61df61095 100644 --- a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js +++ b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Impress focus tests', function() { beforeEach(function() { - helper.beforeAllMobile('empty.odp', 'impress'); + helper.beforeAllMobile('focus.odp', 'impress'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js index 92b62f285..4c38617e9 100644 --- a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js +++ b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Apply font changes.', function() { beforeEach(function() { - helper.beforeAllMobile('simple.odt', 'writer'); + helper.beforeAllMobile('apply_font.odt', 'writer'); // Click on edit button cy.get('#mobile-edit-button').click(); diff --git a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js index df8cc63a3..ec0dd75ac 100644 --- a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js +++ b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Apply paragraph properties.', function() { beforeEach(function() { - helper.beforeAllMobile('simple.odt', 'writer'); + helper.beforeAllMobile('apply_paragraph_properties.odt', 'writer'); // Click on edit button cy.get('#mobile-edit-button').click(); diff --git a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js index 6383987b7..9915d7323 100644 --- a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js +++ b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Pushing bottom toolbar items.', function() { beforeEach(function() { - helper.beforeAllMobile('simple.odt', 'writer'); + helper.beforeAllMobile('bottom_toolbar.odt', 'writer'); // Click on edit button cy.get('#mobile-edit-button').click(); diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js b/cypress_test/integration_tests/mobile/writer/focus_spec.js index d17302675..b42837f57 100644 --- a/cypress_test/integration_tests/mobile/writer/focus_spec.js +++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Focus tests', function() { beforeEach(function() { - helper.beforeAllMobile('empty.odt', 'writer'); + helper.beforeAllMobile('focus.odt', 'writer'); }); afterEach(function() { @@ -151,7 +151,7 @@ describe('Focus tests', function() { .should('be.eq', 'clipboard'); }); - it('Shape related focus.', function() { + it.skip('Shape related focus.', function() { // Click on edit button cy.get('#mobile-edit-button').click(); diff --git a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js index 91cb9d15c..7f849dd25 100644 --- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js +++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Insert fields via insertion wizard.', function() { beforeEach(function() { - helper.beforeAllMobile('simple.odt', 'writer'); + helper.beforeAllMobile('insert_field.odt', 'writer'); // Click on edit button cy.get('#mobile-edit-button').click(); diff --git a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js index 245c3b283..90b6b0d9e 100644 --- a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js +++ b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Insert formatting mark via insertion wizard.', function() { beforeEach(function() { - helper.beforeAllMobile('simple.odt', 'writer'); + helper.beforeAllMobile('insert_formatting_mark.odt', 'writer'); // Click on edit button cy.get('#mobile-edit-button').click(); diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js index c8333b221..70d13c570 100644 --- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js +++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Insert objects via insertion wizard.', function() { beforeEach(function() { - helper.beforeAllMobile('empty.odt', 'writer'); + helper.beforeAllMobile('insert_object.odt', 'writer'); // Click on edit button cy.get('#mobile-edit-button').click(); diff --git a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js index d9c25ecb5..676eb2703 100644 --- a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js +++ b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Mobile wizard state tests', function() { beforeEach(function() { - helper.beforeAllMobile('empty.odt', 'writer'); + helper.beforeAllMobile('mobile_wizard_state.odt', 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js index 3b2b182ba..b1121d019 100644 --- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js +++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Change shape properties via mobile wizard.', function() { beforeEach(function() { - helper.beforeAllMobile('empty.odt', 'writer'); + helper.beforeAllMobile('shape_properties.odt', 'writer'); // Click on edit button cy.get('#mobile-edit-button').click(); @@ -201,7 +201,7 @@ describe('Change shape properties via mobile wizard.', function() { .should('have.attr', 'stroke', 'rgb(152,0,0)'); }); - it('Change line style', function() { + it.skip('Change line style', function() { // TODO: Layout of the line properties panel is completely broken. if (Cypress.env('LO_CORE_VERSION') === 'master') return; diff --git a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js index 3c594e3c8..54a3c5120 100644 --- a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js +++ b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe.skip('Spell checking menu.', function() { beforeEach(function() { - helper.beforeAllMobile('spellcheck.odt', 'writer'); + helper.beforeAllMobile('spellchecking.odt', 'writer'); // Click on edit button cy.get('#mobile-edit-button').click(); diff --git a/cypress_test/integration_tests/mobile/writer/styles_spec.js b/cypress_test/integration_tests/mobile/writer/styles_spec.js index 21d0321dd..ec8eb9263 100644 --- a/cypress_test/integration_tests/mobile/writer/styles_spec.js +++ b/cypress_test/integration_tests/mobile/writer/styles_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Apply/modify styles.', function() { beforeEach(function() { - helper.beforeAllMobile('simple.odt', 'writer'); + helper.beforeAllMobile('styles.odt', 'writer'); // Click on edit button cy.get('#mobile-edit-button').click(); diff --git a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js index 0e372c22e..837f55d6f 100644 --- a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js +++ b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Change table properties / layout via mobile wizard.', function() { beforeEach(function() { - helper.beforeAllMobile('empty.odt', 'writer'); + helper.beforeAllMobile('table_properties.odt', 'writer'); }); afterEach(function() { @@ -55,7 +55,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); openTablePanel(); @@ -88,7 +88,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); openTablePanel(); @@ -121,7 +121,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); openTablePanel(); @@ -154,7 +154,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); openTablePanel(); @@ -187,7 +187,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); openTablePanel(); @@ -220,7 +220,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); openTablePanel(); @@ -254,7 +254,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); openTablePanel(); @@ -285,7 +285,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); moveCursorToFirstCell(); @@ -317,7 +317,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); openTablePanel(); @@ -349,7 +349,7 @@ describe('Change table properties / layout via mobile wizard.', function() { if (Cypress.env('LO_CORE_VERSION') === 'master') return; - before('table.odt'); + before('table_properties2.odt'); openTablePanel(); diff --git a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js index a0e935405..baef8f820 100644 --- a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js +++ b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js @@ -4,7 +4,7 @@ var helper = require('../../common/helper'); describe('Toolbar tests', function() { beforeEach(function() { - helper.beforeAllMobile('empty.odt', 'writer'); + helper.beforeAllMobile('toolbar.odt', 'writer'); }); afterEach(function() { commit ab726bf4a7948bc0409a345dcc069ae5c1f59787 Author: Weblate <nore...@documentfoundation.org> AuthorDate: Sat Feb 22 09:15:52 2020 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Feb 22 19:01:59 2020 +0100 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Change-Id: I1ddef70d8fdf32d7f94a761488ded9aaffcd3599 Translation: LibreOffice Online/loleaflet-ui Translate-URL: https://weblate.documentfoundation.org/projects/libo_online/loleaflet-ui/ update translations LibreOffice Online/android-app (Greek) Currently translated at 100.0% (99 of 99 strings) Change-Id: I7e8d714083031eb88b1ca2cd9efe1a06e449cfee update translations LibreOffice Online/android-lib (Greek) Currently translated at 100.0% (8 of 8 strings) Change-Id: Ia2f618bc350f9a66adcaa45ea1f188b6190e5d37 update translations LibreOffice Online/android-lib (Norwegian Bokmål) Currently translated at 100.0% (8 of 8 strings) Change-Id: I7475fe7c8c996646335861491ebade1185bef1d6 update translations LibreOffice Online/loleaflet-ui (Norwegian Bokmål) Currently translated at 81.9% (235 of 287 strings) Change-Id: I5cbcb66f943f9c70073e85eec51ff5d13bcaf9ec update translations LibreOffice Online/loleaflet-ui (Greek) Currently translated at 100.0% (287 of 287 strings) Change-Id: I9c8e9365bc22741062c3c4386085bd7b9c50697a Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89248 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml index 34250664d..3fc648c85 100644 --- a/android/app/src/main/res/values-el/strings.xml +++ b/android/app/src/main/res/values-el/strings.xml @@ -97,4 +97,6 @@ <string name="app_description">"Το $APP_NAME είναι μια σύγχρονη, εύχρηστη, σειρά προγραμμάτων για επεξεργασία κειμένου, υπολογιστικά φύλλα, παρουσιάσεις και άλλα."</string> <string name="app_version">"Έκδοση: %1$s, Αναγνωριστικό δόμησης: %2$s"</string> <string name="app_name_settings">Ρυθμίσεις</string> + <string name="pref_enable_chrome_debugger_info">Ενεργοποίηση της χρήσης του εργαλείου αποσφαλμάτωσης Chrome στο έγγραφο.</string> + <string name="pref_enable_chrome_debugger">Αποσφαλμάτωση Chrome</string> </resources> \ No newline at end of file diff --git a/android/lib/src/main/res/values-el/strings.xml b/android/lib/src/main/res/values-el/strings.xml index 1d4733d7f..8ca9dc240 100644 --- a/android/lib/src/main/res/values-el/strings.xml +++ b/android/lib/src/main/res/values-el/strings.xml @@ -6,4 +6,6 @@ <string name="failed_to_load_file">Αποτυχία καθορισμού αρχείου φόρτωσης</string> <string name="storage_permission_required">Απαιτείται άδεια αποθήκευσης</string> <string name="temp_file_saving_disabled">Αυτό το αρχείο είναι μόνο για ανάγνωση, η αποθήκευση είναι απενεργοποιημένη.</string> + <string name="preparing_for_the_first_start_after_an_update">Προετοιμασία πρώτης εκκίνησης μετά από ενημέρωση.</string> + <string name="saving">Αποθηκεύεται…</string> </resources> \ No newline at end of file diff --git a/android/lib/src/main/res/values-nb-rNO/strings.xml b/android/lib/src/main/res/values-nb-rNO/strings.xml index a6b3daec9..d0ea3eb5a 100644 --- a/android/lib/src/main/res/values-nb-rNO/strings.xml +++ b/android/lib/src/main/res/values-nb-rNO/strings.xml @@ -1,2 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<resources></resources> \ No newline at end of file +<resources> + <string name="loading">Laster...</string> + <string name="preparing_for_the_first_start_after_an_update">Forbereder seg på første start etter en oppdatering.</string> + <string name="saving">Lagrer....</string> + <string name="cannot_open_file_chooser">Kan ikke åpne filvelgeren</string> + <string name="failed_to_insert_image">Kunne ikke sette inn bilde</string> + <string name="failed_to_load_file">Kunne ikke bestemme filen som skal lastes inn</string> + <string name="storage_permission_required">Lagringstillatelse er nødvendig</string> + <string name="temp_file_saving_disabled">Denne filen er skrivebeskyttet, lagring er deaktivert.</string> +</resources> \ No newline at end of file diff --git a/loleaflet/po/ui-ab.po b/loleaflet/po/ui-ab.po index 65dab3dbf..2cfaef0f2 100644 --- a/loleaflet/po/ui-ab.po +++ b/loleaflet/po/ui-ab.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-12 11:04+0100\n" +"POT-Creation-Date: 2020-02-21 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -120,7 +120,7 @@ msgid "Network Graph" msgstr "" #: admin/admin.strings.js:31 src/layer/marker/Annotation.js:252 -#: src/layer/tile/TileLayer.js:379 +#: src/layer/tile/TileLayer.js:380 msgid "Save" msgstr "Иеиқәырхатәуп" @@ -188,7 +188,22 @@ msgstr "Аҿакра агха" msgid "Are you sure you want to terminate this session?" msgstr "Ишәҭахума асеанс ахыркәшара?" -#: admin/src/AdminSocketOverview.js:186 admin/src/AdminSocketOverview.js:288 +#: admin/src/AdminSocketOverview.js:107 admin/src/AdminSocketSettings.js:36 +#: src/control/Control.Menubar.js:1149 src/control/Control.Tabs.js:179 +#: src/control/Control.Tabs.js:196 src/control/Control.Toolbar.js:246 +#: src/control/Toolbar.js:455 +msgid "OK" +msgstr "" + +#: admin/src/AdminSocketOverview.js:108 admin/src/AdminSocketSettings.js:37 +#: src/control/Control.LanguageDialog.js:86 src/control/Control.Menubar.js:1150 +#: src/control/Control.Tabs.js:180 src/control/Control.Tabs.js:197 +#: src/control/Control.Toolbar.js:247 src/control/Toolbar.js:456 +#: src/layer/marker/Annotation.js:183 src/layer/tile/TileLayer.js:381 +msgid "Cancel" +msgstr "Иаҟәыхтәуп" + +#: admin/src/AdminSocketOverview.js:190 admin/src/AdminSocketOverview.js:292 msgid "Documents" msgstr "Адокументқәа" @@ -240,11 +255,11 @@ msgstr "Ариашара" msgid "The server encountered a %0 error while parsing the %1 command." msgstr "" -#: src/control/Control.ContextMenu.js:174 +#: src/control/Control.ContextMenu.js:171 msgid "Delete" msgstr "" -#: src/control/Control.ContextMenu.js:259 +#: src/control/Control.ContextMenu.js:255 msgid "Paste Special" msgstr "" @@ -276,7 +291,7 @@ msgstr "Аамҭа азгәаҭара" msgid "Jump to state" msgstr "" -#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2539 +#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2543 msgid "You" msgstr "Шәара" @@ -328,130 +343,129 @@ msgstr "" msgid "Fixed size" msgstr "" -#: src/control/Control.JSDialogBuilder.js:759 -#: src/control/Control.Toolbar.js:1644 +#: src/control/Control.JSDialogBuilder.js:766 +#: src/control/Control.Toolbar.js:1648 msgid "None" msgstr "Мап" -#: src/control/Control.JSDialogBuilder.js:762 +#: src/control/Control.JSDialogBuilder.js:769 msgid "Color" msgstr "" -#: src/control/Control.JSDialogBuilder.js:765 +#: src/control/Control.JSDialogBuilder.js:772 msgid "Gradient" msgstr "" -#: src/control/Control.JSDialogBuilder.js:768 +#: src/control/Control.JSDialogBuilder.js:775 msgid "Hatching" msgstr "" -#: src/control/Control.JSDialogBuilder.js:772 +#: src/control/Control.JSDialogBuilder.js:779 msgid "Pattern" msgstr "" -#: src/control/Control.JSDialogBuilder.js:905 +#: src/control/Control.JSDialogBuilder.js:912 msgid "From" msgstr "" -#: src/control/Control.JSDialogBuilder.js:908 +#: src/control/Control.JSDialogBuilder.js:915 msgid "To" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1040 +#: src/control/Control.JSDialogBuilder.js:1050 #, fuzzy #| msgid "Font" msgid "Font Name" msgstr "Ашрифт" -#: src/control/Control.JSDialogBuilder.js:1042 +#: src/control/Control.JSDialogBuilder.js:1052 #, fuzzy #| msgid "Font" msgid "Font Size" msgstr "Ашрифт" -#: src/control/Control.JSDialogBuilder.js:1518 +#: src/control/Control.JSDialogBuilder.js:1533 msgid "Rows" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1519 +#: src/control/Control.JSDialogBuilder.js:1534 msgid "Columns" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1539 -#: src/control/Control.Toolbar.js:969 +#: src/control/Control.JSDialogBuilder.js:1554 +#: src/control/Control.Toolbar.js:973 msgid "Insert table" msgstr "Ибжьаргылатәуп атаблица" +#: src/control/Control.JSDialogBuilder.js:1583 +msgid "Line style:" +msgstr "" + #: src/control/Control.LanguageDialog.js:69 src/control/Control.Menubar.js:227 #: src/control/Control.Menubar.js:229 src/control/Control.Menubar.js:231 -#: src/control/Control.Menubar.js:338 src/control/Control.Menubar.js:453 -#: src/control/Control.Toolbar.js:2055 +#: src/control/Control.Menubar.js:337 src/control/Control.Menubar.js:452 +#: src/control/Control.Toolbar.js:2059 msgid "None (Do not check spelling)" msgstr "Мап (аорфографиа гәаҭатәӡам)" -#: src/control/Control.LanguageDialog.js:86 src/control/Toolbar.js:456 -#: src/layer/marker/Annotation.js:183 src/layer/tile/TileLayer.js:380 -msgid "Cancel" -msgstr "Иаҟәыхтәуп" - #: src/control/Control.Menubar.js:21 src/control/Control.Menubar.js:251 -#: src/control/Control.Menubar.js:353 src/control/Control.Menubar.js:469 -#: src/control/Control.Menubar.js:517 src/control/Control.Menubar.js:562 +#: src/control/Control.Menubar.js:352 src/control/Control.Menubar.js:468 +#: src/control/Control.Menubar.js:516 src/control/Control.Menubar.js:561 msgid "Share..." msgstr "" #: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:253 -#: src/control/Control.Menubar.js:355 src/control/Control.Menubar.js:471 -#: src/control/Control.Menubar.js:519 src/control/Control.Menubar.js:564 +#: src/control/Control.Menubar.js:354 src/control/Control.Menubar.js:470 +#: src/control/Control.Menubar.js:518 src/control/Control.Menubar.js:563 msgid "See revision history" msgstr "Аредакциақәа ржурнал" #: src/control/Control.Menubar.js:24 src/control/Control.Menubar.js:254 -#: src/control/Control.Menubar.js:356 src/control/Control.Menubar.js:474 -#: src/control/Control.Menubar.js:521 src/control/Control.Menubar.js:566 +#: src/control/Control.Menubar.js:355 src/control/Control.Menubar.js:473 +#: src/control/Control.Menubar.js:520 src/control/Control.Menubar.js:565 msgid "Download as" msgstr "Иҭагалатәуп ишҧа" #: src/control/Control.Menubar.js:25 src/control/Control.Menubar.js:255 -#: src/control/Control.Menubar.js:357 src/control/Control.Menubar.js:475 -#: src/control/Control.Menubar.js:522 src/control/Control.Menubar.js:567 +#: src/control/Control.Menubar.js:356 src/control/Control.Menubar.js:474 +#: src/control/Control.Menubar.js:521 src/control/Control.Menubar.js:566 msgid "PDF Document (.pdf)" msgstr "PDF (.pdf) адокумент" -#: src/control/Control.Menubar.js:26 src/control/Control.Menubar.js:476 +#: src/control/Control.Menubar.js:26 src/control/Control.Menubar.js:475 msgid "ODF text document (.odt)" msgstr "ODF атеқсттә документ (.odt)" -#: src/control/Control.Menubar.js:27 src/control/Control.Menubar.js:477 +#: src/control/Control.Menubar.js:27 src/control/Control.Menubar.js:476 msgid "Word 2003 Document (.doc)" msgstr "Word 2003 адокумент (.doc)" -#: src/control/Control.Menubar.js:28 src/control/Control.Menubar.js:478 +#: src/control/Control.Menubar.js:28 src/control/Control.Menubar.js:477 msgid "Word Document (.docx)" msgstr "Word адокумент (.docx)" -#: src/control/Control.Menubar.js:29 src/control/Control.Menubar.js:479 +#: src/control/Control.Menubar.js:29 src/control/Control.Menubar.js:478 msgid "Rich Text (.rtf)" msgstr "Rich Text (.rtf)" -#: src/control/Control.Menubar.js:30 src/control/Control.Menubar.js:472 +#: src/control/Control.Menubar.js:30 src/control/Control.Menubar.js:471 #: src/control/Signing.js:601 msgid "Sign document" msgstr "" #: src/control/Control.Menubar.js:32 src/control/Control.Menubar.js:260 -#: src/control/Control.Menubar.js:362 +#: src/control/Control.Menubar.js:361 msgid "Close document" msgstr "Иарктәуп адокумент" #: src/control/Control.Menubar.js:37 src/control/Control.Menubar.js:265 -#: src/control/Control.Menubar.js:367 src/control/Control.Menubar.js:484 -#: src/control/Control.Menubar.js:530 src/control/Control.Menubar.js:575 +#: src/control/Control.Menubar.js:366 src/control/Control.Menubar.js:483 +#: src/control/Control.Menubar.js:529 src/control/Control.Menubar.js:574 msgid "Repair" msgstr "Еиҭашьақәыргылатәуп" #: src/control/Control.Menubar.js:63 src/control/Control.Menubar.js:279 -#: src/control/Control.Toolbar.js:1170 +#: src/control/Control.Toolbar.js:1174 msgid "Reset zoom" msgstr "Иқәгатәуп амасштаб" @@ -460,13 +474,13 @@ msgid "Show Ruler" msgstr "" #: src/control/Control.Menubar.js:74 src/control/Control.Menubar.js:291 -#: src/control/Control.Menubar.js:382 src/control/Control.Menubar.js:623 -#: src/control/Control.Menubar.js:663 src/control/Control.Menubar.js:676 +#: src/control/Control.Menubar.js:381 src/control/Control.Menubar.js:622 +#: src/control/Control.Menubar.js:662 src/control/Control.Menubar.js:675 msgid "Local Image..." msgstr "" #: src/control/Control.Menubar.js:91 src/control/Control.Menubar.js:93 -#: src/control/Control.Menubar.js:639 src/control/Control.Menubar.js:641 +#: src/control/Control.Menubar.js:638 src/control/Control.Menubar.js:640 msgid "All" msgstr "Зегьы" @@ -474,87 +488,87 @@ msgstr "Зегьы" msgid "Text orientation" msgstr "Атеқст аориентациа" -#: src/control/Control.Menubar.js:239 src/control/Control.Menubar.js:341 -#: src/control/Control.Menubar.js:457 +#: src/control/Control.Menubar.js:239 src/control/Control.Menubar.js:340 +#: src/control/Control.Menubar.js:456 msgid "Online Help" msgstr "" -#: src/control/Control.Menubar.js:240 src/control/Control.Menubar.js:342 -#: src/control/Control.Menubar.js:458 +#: src/control/Control.Menubar.js:240 src/control/Control.Menubar.js:341 +#: src/control/Control.Menubar.js:457 msgid "Keyboard shortcuts" msgstr "Аклвишақәа реицхархәашьа" -#: src/control/Control.Menubar.js:241 src/control/Control.Menubar.js:343 -#: src/control/Control.Menubar.js:459 +#: src/control/Control.Menubar.js:241 src/control/Control.Menubar.js:342 +#: src/control/Control.Menubar.js:458 msgid "Report an issue" msgstr "" -#: src/control/Control.Menubar.js:242 src/control/Control.Menubar.js:344 -#: src/control/Control.Menubar.js:460 src/control/Control.Menubar.js:510 -#: src/control/Control.Menubar.js:555 src/control/Control.Menubar.js:617 +#: src/control/Control.Menubar.js:242 src/control/Control.Menubar.js:343 +#: src/control/Control.Menubar.js:459 src/control/Control.Menubar.js:509 +#: src/control/Control.Menubar.js:554 src/control/Control.Menubar.js:616 msgid "About" msgstr "Иазкны" -#: src/control/Control.Menubar.js:244 src/control/Control.Menubar.js:346 -#: src/control/Control.Menubar.js:462 src/map/Map.js:389 +#: src/control/Control.Menubar.js:244 src/control/Control.Menubar.js:345 +#: src/control/Control.Menubar.js:461 src/map/Map.js:389 msgid "Last modification" msgstr "" -#: src/control/Control.Menubar.js:256 src/control/Control.Menubar.js:523 +#: src/control/Control.Menubar.js:256 src/control/Control.Menubar.js:522 msgid "ODF presentation (.odp)" msgstr "ODF апрезентациа (.odp)" -#: src/control/Control.Menubar.js:257 src/control/Control.Menubar.js:524 +#: src/control/Control.Menubar.js:257 src/control/Control.Menubar.js:523 msgid "PowerPoint 2003 Presentation (.ppt)" msgstr "PowerPoint 2003 апрезентациа (.ppt)" -#: src/control/Control.Menubar.js:258 src/control/Control.Menubar.js:525 +#: src/control/Control.Menubar.js:258 src/control/Control.Menubar.js:524 msgid "PowerPoint Presentation (.pptx)" msgstr "PowerPoint апрезентациа (.pptx)" -#: src/control/Control.Menubar.js:332 src/control/Control.Menubar.js:554 -#: src/control/Control.Toolbar.js:1123 +#: src/control/Control.Menubar.js:331 src/control/Control.Menubar.js:553 +#: src/control/Control.Toolbar.js:1127 msgid "Fullscreen presentation" msgstr "Аекранзегьтәи апрезентациа" -#: src/control/Control.Menubar.js:358 src/control/Control.Menubar.js:568 +#: src/control/Control.Menubar.js:357 src/control/Control.Menubar.js:567 msgid "ODF spreadsheet (.ods)" msgstr "ODF аел.таблица (.ods)" -#: src/control/Control.Menubar.js:359 src/control/Control.Menubar.js:569 +#: src/control/Control.Menubar.js:358 src/control/Control.Menubar.js:568 msgid "Excel 2003 Spreadsheet (.xls)" msgstr "Excel 2003 аел. таблица (.xls)" -#: src/control/Control.Menubar.js:360 src/control/Control.Menubar.js:570 +#: src/control/Control.Menubar.js:359 src/control/Control.Menubar.js:569 msgid "Excel Spreadsheet (.xlsx)" msgstr "Excel аел. таблица (.xlsx)" -#: src/control/Control.Menubar.js:474 src/control/Control.Menubar.js:521 -#: src/control/Control.Menubar.js:566 +#: src/control/Control.Menubar.js:473 src/control/Control.Menubar.js:520 +#: src/control/Control.Menubar.js:565 msgid "Export as" msgstr "" -#: src/control/Control.Menubar.js:500 +#: src/control/Control.Menubar.js:499 msgid "Page Setup" msgstr "" -#: src/control/Control.Menubar.js:501 +#: src/control/Control.Menubar.js:500 msgid "Portrait" msgstr "" -#: src/control/Control.Menubar.js:502 +#: src/control/Control.Menubar.js:501 msgid "Landscape" msgstr "" -#: src/control/Control.Menubar.js:763 src/control/Control.Toolbar.js:2054 +#: src/control/Control.Menubar.js:762 src/control/Control.Toolbar.js:2058 msgid "Reset to Default Language" msgstr "Иқәыргылатәуп абызшәа ишыҟаз" -#: src/control/Control.Menubar.js:1148 +#: src/control/Control.Menubar.js:1147 msgid "Are you sure you want to delete this slide?" msgstr "Ианыхтәума абри аслаид?" -#: src/control/Control.Menubar.js:1182 src/map/Clipboard.js:769 +#: src/control/Control.Menubar.js:1185 src/map/Clipboard.js:773 msgid "<p>Your browser has very limited access to the clipboard, so use these keyboard shortcuts:<ul><li><b>Ctrl+C</b>: For copying.</li><li><b>Ctrl+X</b>: For cutting.</li><li><b>Ctrl+V</b>: For pasting.</li></ul></p>" msgstr "" @@ -578,7 +592,7 @@ msgstr "Иҭаргылатәуп абӷьыц анаҩс" msgid "Are you sure you want to delete sheet, %sheet% ?" msgstr "Ианыхтәума абӷьыц %sheet%?" -#: src/control/Control.Tabs.js:190 +#: src/control/Control.Tabs.js:194 msgid "Enter new sheet name" msgstr "Иҭажәгал, абӷьыц ахьӡ ҿыц" @@ -586,173 +600,173 @@ msgstr "Иҭажәгал, абӷьыц ахьӡ ҿыц" msgid "Are you sure you want to delete this page?" msgstr "Ианыхтәума абри адаҟьа?" -#: src/control/Control.Toolbar.js:856 +#: src/control/Control.Toolbar.js:860 msgid "Default Style" msgstr "" -#: src/control/Control.Toolbar.js:913 +#: src/control/Control.Toolbar.js:917 msgid "Borders" msgstr "Аҿыкәырша" -#: src/control/Control.Toolbar.js:921 +#: src/control/Control.Toolbar.js:925 msgid "More..." msgstr "Иҵегь..." -#: src/control/Control.Toolbar.js:974 +#: src/control/Control.Toolbar.js:978 msgid "Insert Local Image" msgstr "" -#: src/control/Control.Toolbar.js:978 +#: src/control/Control.Toolbar.js:982 #, fuzzy msgid "Insert shapes" msgstr "Иҭаргылатәуп абӷьыц" -#: src/control/Control.Toolbar.js:1057 +#: src/control/Control.Toolbar.js:1061 #, fuzzy #| msgid "Function" msgid "Function Wizard" msgstr "Афункциа" -#: src/control/Control.Toolbar.js:1101 +#: src/control/Control.Toolbar.js:1105 msgid "First sheet" msgstr "Актәи абӷьыц" -#: src/control/Control.Toolbar.js:1102 +#: src/control/Control.Toolbar.js:1106 msgid "Previous sheet" msgstr "Аҧхьатәи абӷьыц" -#: src/control/Control.Toolbar.js:1103 +#: src/control/Control.Toolbar.js:1107 msgid "Next sheet" msgstr "Анаҩстәи абӷьыц" -#: src/control/Control.Toolbar.js:1104 +#: src/control/Control.Toolbar.js:1108 msgid "Last sheet" msgstr "Аҵыхәтәантәи абӷьыц" -#: src/control/Control.Toolbar.js:1105 src/layer/tile/CalcTileLayer.js:179 +#: src/control/Control.Toolbar.js:1109 src/layer/tile/CalcTileLayer.js:179 msgid "Insert sheet" msgstr "Иҭаргылатәуп абӷьыц" -#: src/control/Control.Toolbar.js:1147 +#: src/control/Control.Toolbar.js:1151 #, fuzzy msgid "Search" msgstr "Иҧшаатәуп:" -#: src/control/Control.Toolbar.js:1153 +#: src/control/Control.Toolbar.js:1157 msgid "Cancel the search" msgstr "Иаҟәыхтәуп аҧшаара" -#: src/control/Control.Toolbar.js:1160 src/layer/tile/CalcTileLayer.js:120 +#: src/control/Control.Toolbar.js:1164 src/layer/tile/CalcTileLayer.js:120 #: src/layer/tile/ImpressTileLayer.js:155 src/layer/tile/WriterTileLayer.js:100 msgid "Always follow the editor" msgstr "" -#: src/control/Control.Toolbar.js:1163 src/layer/tile/CalcTileLayer.js:123 +#: src/control/Control.Toolbar.js:1167 src/layer/tile/CalcTileLayer.js:123 #: src/layer/tile/ImpressTileLayer.js:158 src/layer/tile/WriterTileLayer.js:103 msgid "Current" msgstr "" -#: src/control/Control.Toolbar.js:1246 +#: src/control/Control.Toolbar.js:1250 msgid "%user has joined" msgstr "" -#: src/control/Control.Toolbar.js:1247 +#: src/control/Control.Toolbar.js:1251 msgid "%user has left" msgstr "" -#: src/control/Control.Toolbar.js:1609 +#: src/control/Control.Toolbar.js:1613 msgid "Number of Sheets" msgstr "Абӷьыцқәа рхыҧхьаӡара" -#: src/control/Control.Toolbar.js:1614 +#: src/control/Control.Toolbar.js:1618 msgid "Selected range of cells" msgstr "Иалкаау абларҭақәа" -#: src/control/Control.Toolbar.js:1619 src/control/Control.Toolbar.js:1676 +#: src/control/Control.Toolbar.js:1623 src/control/Control.Toolbar.js:1680 msgid "Entering text mode" msgstr "Атексттә режим" -#: src/control/Control.Toolbar.js:1628 src/control/Control.Toolbar.js:1681 +#: src/control/Control.Toolbar.js:1632 src/control/Control.Toolbar.js:1685 msgid "Selection Mode" msgstr "Алхра арежим" -#: src/control/Control.Toolbar.js:1633 +#: src/control/Control.Toolbar.js:1637 msgid "Choice of functions" msgstr "Афункциа алхра" -#: src/control/Control.Toolbar.js:1637 +#: src/control/Control.Toolbar.js:1641 msgid "Average" msgstr "Ибжьаратәу" -#: src/control/Control.Toolbar.js:1638 +#: src/control/Control.Toolbar.js:1642 msgid "CountA" msgstr "Ахыҧхьаӡара2" -#: src/control/Control.Toolbar.js:1639 +#: src/control/Control.Toolbar.js:1643 msgid "Count" msgstr "Ахыҧхьаӡара" -#: src/control/Control.Toolbar.js:1640 +#: src/control/Control.Toolbar.js:1644 msgid "Maximum" msgstr "Амаксимум" -#: src/control/Control.Toolbar.js:1641 +#: src/control/Control.Toolbar.js:1645 msgid "Minimum" msgstr "Аминимум" -#: src/control/Control.Toolbar.js:1642 +#: src/control/Control.Toolbar.js:1646 msgid "Sum" msgstr "Аицҵалыҵ" -#: src/control/Control.Toolbar.js:1643 +#: src/control/Control.Toolbar.js:1647 msgid "Selection count" msgstr "Иалкаауп" -#: src/control/Control.Toolbar.js:1666 +#: src/control/Control.Toolbar.js:1670 msgid "Number of Pages" msgstr "Адаҟьақәа рхыҧхьаӡара" -#: src/control/Control.Toolbar.js:1671 +#: src/control/Control.Toolbar.js:1675 msgid "Word Counter" msgstr "Ажәақәа рхыҧхьаӡара" -#: src/control/Control.Toolbar.js:1706 +#: src/control/Control.Toolbar.js:1710 msgid "Number of Slides" msgstr "Аслаидқәа рхыҧхьаӡара" -#: src/control/Control.Toolbar.js:1746 +#: src/control/Control.Toolbar.js:1750 msgid "%n users" msgstr "Ахархәаҩцәа: %n" -#: src/control/Control.Toolbar.js:1747 +#: src/control/Control.Toolbar.js:1751 msgid "1 user" msgstr "Ахархәаҩцәа: 1" -#: src/control/Control.Toolbar.js:1748 +#: src/control/Control.Toolbar.js:1752 msgid "0 users" msgstr "Ахархәаҩцәа: 0" -#: src/control/Control.Toolbar.js:2150 +#: src/control/Control.Toolbar.js:2154 msgid "Style" msgstr "Астиль" -#: src/control/Control.Toolbar.js:2173 +#: src/control/Control.Toolbar.js:2177 msgid "Font" msgstr "Ашрифт" -#: src/control/Control.Toolbar.js:2199 +#: src/control/Control.Toolbar.js:2203 msgid "Previous slide" msgstr "Аҧхьатәи аслаид" -#: src/control/Control.Toolbar.js:2200 +#: src/control/Control.Toolbar.js:2204 msgid "Next slide" msgstr "Анаҩстәи аслаид" -#: src/control/Control.Toolbar.js:2258 +#: src/control/Control.Toolbar.js:2262 msgid "Conflict Undo/Redo with multiple users. Please use document repair to resolve" msgstr "" -#: src/control/Control.Toolbar.js:2545 +#: src/control/Control.Toolbar.js:2549 msgid "Readonly" msgstr "Аҧхьара мацара" @@ -893,7 +907,7 @@ msgstr "" msgid "Downloading..." msgstr "Аҭагалара..." -#: src/control/Toolbar.js:104 src/map/Map.js:1399 +#: src/control/Toolbar.js:104 src/map/Map.js:1409 msgid "Saving..." msgstr "Аиқәырхара..." @@ -917,10 +931,6 @@ msgstr "" msgid "Link" msgstr "" -#: src/control/Toolbar.js:455 -msgid "OK" -msgstr "" - #: src/core/Socket.js:59 msgid "IE11 has reached its maximum number of connections. Please see this document to increase this limit if needed: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections" msgstr "" @@ -997,7 +1007,7 @@ msgstr "" msgid "Wrong password provided. Please try again." msgstr "Ииашам ажәамаӡа. Иҭажәгал ҽазнык." -#: src/core/Socket.js:751 src/map/Map.js:1402 +#: src/core/Socket.js:751 src/map/Map.js:1412 msgid "Loading..." msgstr "Аҭагалара..." @@ -1168,15 +1178,15 @@ msgstr "" msgid "Failed to download clipboard, please re-copy" msgstr "" -#: src/map/Clipboard.js:767 +#: src/map/Clipboard.js:771 msgid "<p>Please use the copy/paste buttons on your on-screen keyboard.</p>" msgstr "" -#: src/map/Clipboard.js:792 +#: src/map/Clipboard.js:796 msgid "<p>If you would like to share larger elements of your document with other applications it is necessary to first download them onto your device. To do that press the \"Start download\" button below, and when complete click \"Confirm copy to clipboard\".</p><p>If you are copy and pasting between documents inside %productName, there is no need to download.</p>" msgstr "" -#: src/map/Clipboard.js:808 +#: src/map/Clipboard.js:812 msgid "<p>A download due to a large copy/paste operation has already started. Please, wait for the current download or cancel it before starting a new one</p>" msgstr "" @@ -1194,7 +1204,7 @@ msgstr "" msgid "%d minutes ago" msgstr "" -#: src/map/Map.js:1263 +#: src/map/Map.js:1273 msgid "Inactive document - please click to resume editing" msgstr "Иактивым адокумент - шәаӷәыӷәӷәа аредакциазура азы" diff --git a/loleaflet/po/ui-af.po b/loleaflet/po/ui-af.po index 4b6128199..58f39f2c2 100644 --- a/loleaflet/po/ui-af.po +++ b/loleaflet/po/ui-af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-12 11:04+0100\n" +"POT-Creation-Date: 2020-02-21 14:50+0100\n" "PO-Revision-Date: 2020-02-03 13:38+0000\n" "Last-Translator: Adolfo Jayme Barrientos <f...@libreoffice.org>\n" "Language-Team: Afrikaans <https://weblate.documentfoundation.org/projects/libo_online/loleaflet-ui/af/>\n" @@ -123,7 +123,7 @@ msgid "Network Graph" msgstr "" #: admin/admin.strings.js:31 src/layer/marker/Annotation.js:252 -#: src/layer/tile/TileLayer.js:379 +#: src/layer/tile/TileLayer.js:380 msgid "Save" msgstr "Stoor" @@ -191,7 +191,22 @@ msgstr "" msgid "Are you sure you want to terminate this session?" msgstr "" -#: admin/src/AdminSocketOverview.js:186 admin/src/AdminSocketOverview.js:288 +#: admin/src/AdminSocketOverview.js:107 admin/src/AdminSocketSettings.js:36 +#: src/control/Control.Menubar.js:1149 src/control/Control.Tabs.js:179 +#: src/control/Control.Tabs.js:196 src/control/Control.Toolbar.js:246 +#: src/control/Toolbar.js:455 +msgid "OK" +msgstr "" + +#: admin/src/AdminSocketOverview.js:108 admin/src/AdminSocketSettings.js:37 +#: src/control/Control.LanguageDialog.js:86 src/control/Control.Menubar.js:1150 +#: src/control/Control.Tabs.js:180 src/control/Control.Tabs.js:197 +#: src/control/Control.Toolbar.js:247 src/control/Toolbar.js:456 +#: src/layer/marker/Annotation.js:183 src/layer/tile/TileLayer.js:381 +msgid "Cancel" +msgstr "" + +#: admin/src/AdminSocketOverview.js:190 admin/src/AdminSocketOverview.js:292 #, fuzzy msgid "Documents" msgstr "Dokumente" @@ -244,11 +259,11 @@ msgstr "" msgid "The server encountered a %0 error while parsing the %1 command." msgstr "" -#: src/control/Control.ContextMenu.js:174 +#: src/control/Control.ContextMenu.js:171 msgid "Delete" msgstr "" -#: src/control/Control.ContextMenu.js:259 +#: src/control/Control.ContextMenu.js:255 msgid "Paste Special" msgstr "" @@ -281,7 +296,7 @@ msgstr "" msgid "Jump to state" msgstr "" -#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2539 +#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2543 msgid "You" msgstr "" @@ -333,126 +348,125 @@ msgstr "" msgid "Fixed size" msgstr "" -#: src/control/Control.JSDialogBuilder.js:759 -#: src/control/Control.Toolbar.js:1644 +#: src/control/Control.JSDialogBuilder.js:766 +#: src/control/Control.Toolbar.js:1648 msgid "None" msgstr "" -#: src/control/Control.JSDialogBuilder.js:762 +#: src/control/Control.JSDialogBuilder.js:769 msgid "Color" msgstr "" -#: src/control/Control.JSDialogBuilder.js:765 +#: src/control/Control.JSDialogBuilder.js:772 msgid "Gradient" msgstr "" -#: src/control/Control.JSDialogBuilder.js:768 +#: src/control/Control.JSDialogBuilder.js:775 msgid "Hatching" msgstr "" -#: src/control/Control.JSDialogBuilder.js:772 +#: src/control/Control.JSDialogBuilder.js:779 msgid "Pattern" msgstr "" -#: src/control/Control.JSDialogBuilder.js:905 +#: src/control/Control.JSDialogBuilder.js:912 msgid "From" msgstr "" -#: src/control/Control.JSDialogBuilder.js:908 +#: src/control/Control.JSDialogBuilder.js:915 msgid "To" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1040 +#: src/control/Control.JSDialogBuilder.js:1050 msgid "Font Name" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1042 +#: src/control/Control.JSDialogBuilder.js:1052 msgid "Font Size" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1518 +#: src/control/Control.JSDialogBuilder.js:1533 msgid "Rows" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1519 +#: src/control/Control.JSDialogBuilder.js:1534 msgid "Columns" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1539 -#: src/control/Control.Toolbar.js:969 +#: src/control/Control.JSDialogBuilder.js:1554 +#: src/control/Control.Toolbar.js:973 msgid "Insert table" msgstr "" +#: src/control/Control.JSDialogBuilder.js:1583 +msgid "Line style:" +msgstr "" + #: src/control/Control.LanguageDialog.js:69 src/control/Control.Menubar.js:227 #: src/control/Control.Menubar.js:229 src/control/Control.Menubar.js:231 -#: src/control/Control.Menubar.js:338 src/control/Control.Menubar.js:453 -#: src/control/Control.Toolbar.js:2055 +#: src/control/Control.Menubar.js:337 src/control/Control.Menubar.js:452 +#: src/control/Control.Toolbar.js:2059 msgid "None (Do not check spelling)" msgstr "" -#: src/control/Control.LanguageDialog.js:86 src/control/Toolbar.js:456 -#: src/layer/marker/Annotation.js:183 src/layer/tile/TileLayer.js:380 -msgid "Cancel" -msgstr "" - #: src/control/Control.Menubar.js:21 src/control/Control.Menubar.js:251 -#: src/control/Control.Menubar.js:353 src/control/Control.Menubar.js:469 -#: src/control/Control.Menubar.js:517 src/control/Control.Menubar.js:562 +#: src/control/Control.Menubar.js:352 src/control/Control.Menubar.js:468 +#: src/control/Control.Menubar.js:516 src/control/Control.Menubar.js:561 msgid "Share..." msgstr "Deel..." #: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:253 -#: src/control/Control.Menubar.js:355 src/control/Control.Menubar.js:471 -#: src/control/Control.Menubar.js:519 src/control/Control.Menubar.js:564 +#: src/control/Control.Menubar.js:354 src/control/Control.Menubar.js:470 +#: src/control/Control.Menubar.js:518 src/control/Control.Menubar.js:563 msgid "See revision history" msgstr "" #: src/control/Control.Menubar.js:24 src/control/Control.Menubar.js:254 -#: src/control/Control.Menubar.js:356 src/control/Control.Menubar.js:474 -#: src/control/Control.Menubar.js:521 src/control/Control.Menubar.js:566 +#: src/control/Control.Menubar.js:355 src/control/Control.Menubar.js:473 +#: src/control/Control.Menubar.js:520 src/control/Control.Menubar.js:565 msgid "Download as" msgstr "" #: src/control/Control.Menubar.js:25 src/control/Control.Menubar.js:255 -#: src/control/Control.Menubar.js:357 src/control/Control.Menubar.js:475 -#: src/control/Control.Menubar.js:522 src/control/Control.Menubar.js:567 +#: src/control/Control.Menubar.js:356 src/control/Control.Menubar.js:474 +#: src/control/Control.Menubar.js:521 src/control/Control.Menubar.js:566 msgid "PDF Document (.pdf)" msgstr "" -#: src/control/Control.Menubar.js:26 src/control/Control.Menubar.js:476 +#: src/control/Control.Menubar.js:26 src/control/Control.Menubar.js:475 msgid "ODF text document (.odt)" msgstr "" -#: src/control/Control.Menubar.js:27 src/control/Control.Menubar.js:477 +#: src/control/Control.Menubar.js:27 src/control/Control.Menubar.js:476 msgid "Word 2003 Document (.doc)" msgstr "" -#: src/control/Control.Menubar.js:28 src/control/Control.Menubar.js:478 +#: src/control/Control.Menubar.js:28 src/control/Control.Menubar.js:477 msgid "Word Document (.docx)" msgstr "" -#: src/control/Control.Menubar.js:29 src/control/Control.Menubar.js:479 +#: src/control/Control.Menubar.js:29 src/control/Control.Menubar.js:478 msgid "Rich Text (.rtf)" msgstr "" -#: src/control/Control.Menubar.js:30 src/control/Control.Menubar.js:472 +#: src/control/Control.Menubar.js:30 src/control/Control.Menubar.js:471 #: src/control/Signing.js:601 msgid "Sign document" msgstr "" #: src/control/Control.Menubar.js:32 src/control/Control.Menubar.js:260 -#: src/control/Control.Menubar.js:362 +#: src/control/Control.Menubar.js:361 msgid "Close document" msgstr "" #: src/control/Control.Menubar.js:37 src/control/Control.Menubar.js:265 -#: src/control/Control.Menubar.js:367 src/control/Control.Menubar.js:484 -#: src/control/Control.Menubar.js:530 src/control/Control.Menubar.js:575 +#: src/control/Control.Menubar.js:366 src/control/Control.Menubar.js:483 +#: src/control/Control.Menubar.js:529 src/control/Control.Menubar.js:574 msgid "Repair" msgstr "" #: src/control/Control.Menubar.js:63 src/control/Control.Menubar.js:279 -#: src/control/Control.Toolbar.js:1170 +#: src/control/Control.Toolbar.js:1174 msgid "Reset zoom" msgstr "" @@ -461,13 +475,13 @@ msgid "Show Ruler" msgstr "" #: src/control/Control.Menubar.js:74 src/control/Control.Menubar.js:291 -#: src/control/Control.Menubar.js:382 src/control/Control.Menubar.js:623 -#: src/control/Control.Menubar.js:663 src/control/Control.Menubar.js:676 +#: src/control/Control.Menubar.js:381 src/control/Control.Menubar.js:622 +#: src/control/Control.Menubar.js:662 src/control/Control.Menubar.js:675 msgid "Local Image..." msgstr "" #: src/control/Control.Menubar.js:91 src/control/Control.Menubar.js:93 -#: src/control/Control.Menubar.js:639 src/control/Control.Menubar.js:641 +#: src/control/Control.Menubar.js:638 src/control/Control.Menubar.js:640 msgid "All" msgstr "" @@ -475,87 +489,87 @@ msgstr "" msgid "Text orientation" msgstr "" -#: src/control/Control.Menubar.js:239 src/control/Control.Menubar.js:341 -#: src/control/Control.Menubar.js:457 +#: src/control/Control.Menubar.js:239 src/control/Control.Menubar.js:340 +#: src/control/Control.Menubar.js:456 msgid "Online Help" msgstr "" -#: src/control/Control.Menubar.js:240 src/control/Control.Menubar.js:342 -#: src/control/Control.Menubar.js:458 +#: src/control/Control.Menubar.js:240 src/control/Control.Menubar.js:341 +#: src/control/Control.Menubar.js:457 msgid "Keyboard shortcuts" msgstr "" -#: src/control/Control.Menubar.js:241 src/control/Control.Menubar.js:343 -#: src/control/Control.Menubar.js:459 +#: src/control/Control.Menubar.js:241 src/control/Control.Menubar.js:342 +#: src/control/Control.Menubar.js:458 msgid "Report an issue" msgstr "" -#: src/control/Control.Menubar.js:242 src/control/Control.Menubar.js:344 -#: src/control/Control.Menubar.js:460 src/control/Control.Menubar.js:510 -#: src/control/Control.Menubar.js:555 src/control/Control.Menubar.js:617 +#: src/control/Control.Menubar.js:242 src/control/Control.Menubar.js:343 +#: src/control/Control.Menubar.js:459 src/control/Control.Menubar.js:509 +#: src/control/Control.Menubar.js:554 src/control/Control.Menubar.js:616 msgid "About" msgstr "" -#: src/control/Control.Menubar.js:244 src/control/Control.Menubar.js:346 -#: src/control/Control.Menubar.js:462 src/map/Map.js:389 +#: src/control/Control.Menubar.js:244 src/control/Control.Menubar.js:345 +#: src/control/Control.Menubar.js:461 src/map/Map.js:389 msgid "Last modification" msgstr "" -#: src/control/Control.Menubar.js:256 src/control/Control.Menubar.js:523 +#: src/control/Control.Menubar.js:256 src/control/Control.Menubar.js:522 msgid "ODF presentation (.odp)" msgstr "" -#: src/control/Control.Menubar.js:257 src/control/Control.Menubar.js:524 +#: src/control/Control.Menubar.js:257 src/control/Control.Menubar.js:523 msgid "PowerPoint 2003 Presentation (.ppt)" msgstr "" -#: src/control/Control.Menubar.js:258 src/control/Control.Menubar.js:525 +#: src/control/Control.Menubar.js:258 src/control/Control.Menubar.js:524 msgid "PowerPoint Presentation (.pptx)" msgstr "" -#: src/control/Control.Menubar.js:332 src/control/Control.Menubar.js:554 -#: src/control/Control.Toolbar.js:1123 +#: src/control/Control.Menubar.js:331 src/control/Control.Menubar.js:553 +#: src/control/Control.Toolbar.js:1127 msgid "Fullscreen presentation" msgstr "" -#: src/control/Control.Menubar.js:358 src/control/Control.Menubar.js:568 +#: src/control/Control.Menubar.js:357 src/control/Control.Menubar.js:567 msgid "ODF spreadsheet (.ods)" msgstr "" -#: src/control/Control.Menubar.js:359 src/control/Control.Menubar.js:569 +#: src/control/Control.Menubar.js:358 src/control/Control.Menubar.js:568 msgid "Excel 2003 Spreadsheet (.xls)" msgstr "" -#: src/control/Control.Menubar.js:360 src/control/Control.Menubar.js:570 +#: src/control/Control.Menubar.js:359 src/control/Control.Menubar.js:569 msgid "Excel Spreadsheet (.xlsx)" msgstr "" -#: src/control/Control.Menubar.js:474 src/control/Control.Menubar.js:521 -#: src/control/Control.Menubar.js:566 +#: src/control/Control.Menubar.js:473 src/control/Control.Menubar.js:520 +#: src/control/Control.Menubar.js:565 msgid "Export as" msgstr "" -#: src/control/Control.Menubar.js:500 +#: src/control/Control.Menubar.js:499 msgid "Page Setup" msgstr "" -#: src/control/Control.Menubar.js:501 +#: src/control/Control.Menubar.js:500 msgid "Portrait" msgstr "" -#: src/control/Control.Menubar.js:502 +#: src/control/Control.Menubar.js:501 msgid "Landscape" msgstr "" -#: src/control/Control.Menubar.js:763 src/control/Control.Toolbar.js:2054 +#: src/control/Control.Menubar.js:762 src/control/Control.Toolbar.js:2058 msgid "Reset to Default Language" msgstr "" -#: src/control/Control.Menubar.js:1148 +#: src/control/Control.Menubar.js:1147 msgid "Are you sure you want to delete this slide?" msgstr "" -#: src/control/Control.Menubar.js:1182 src/map/Clipboard.js:769 +#: src/control/Control.Menubar.js:1185 src/map/Clipboard.js:773 msgid "<p>Your browser has very limited access to the clipboard, so use these keyboard shortcuts:<ul><li><b>Ctrl+C</b>: For copying.</li><li><b>Ctrl+X</b>: For cutting.</li><li><b>Ctrl+V</b>: For pasting.</li></ul></p>" msgstr "" @@ -579,7 +593,7 @@ msgstr "" msgid "Are you sure you want to delete sheet, %sheet% ?" msgstr "" -#: src/control/Control.Tabs.js:190 +#: src/control/Control.Tabs.js:194 msgid "Enter new sheet name" msgstr "" @@ -587,172 +601,172 @@ msgstr "" msgid "Are you sure you want to delete this page?" msgstr "" -#: src/control/Control.Toolbar.js:856 +#: src/control/Control.Toolbar.js:860 msgid "Default Style" msgstr "" -#: src/control/Control.Toolbar.js:913 +#: src/control/Control.Toolbar.js:917 msgid "Borders" msgstr "" -#: src/control/Control.Toolbar.js:921 +#: src/control/Control.Toolbar.js:925 msgid "More..." msgstr "" -#: src/control/Control.Toolbar.js:974 +#: src/control/Control.Toolbar.js:978 msgid "Insert Local Image" msgstr "" -#: src/control/Control.Toolbar.js:978 +#: src/control/Control.Toolbar.js:982 msgid "Insert shapes" msgstr "" -#: src/control/Control.Toolbar.js:1057 +#: src/control/Control.Toolbar.js:1061 msgid "Function Wizard" msgstr "" -#: src/control/Control.Toolbar.js:1101 +#: src/control/Control.Toolbar.js:1105 msgid "First sheet" msgstr "" -#: src/control/Control.Toolbar.js:1102 +#: src/control/Control.Toolbar.js:1106 msgid "Previous sheet" msgstr "" -#: src/control/Control.Toolbar.js:1103 +#: src/control/Control.Toolbar.js:1107 msgid "Next sheet" msgstr "" -#: src/control/Control.Toolbar.js:1104 +#: src/control/Control.Toolbar.js:1108 msgid "Last sheet" msgstr "" -#: src/control/Control.Toolbar.js:1105 src/layer/tile/CalcTileLayer.js:179 +#: src/control/Control.Toolbar.js:1109 src/layer/tile/CalcTileLayer.js:179 msgid "Insert sheet" msgstr "" -#: src/control/Control.Toolbar.js:1147 +#: src/control/Control.Toolbar.js:1151 msgid "Search" msgstr "" -#: src/control/Control.Toolbar.js:1153 +#: src/control/Control.Toolbar.js:1157 msgid "Cancel the search" msgstr "" -#: src/control/Control.Toolbar.js:1160 src/layer/tile/CalcTileLayer.js:120 +#: src/control/Control.Toolbar.js:1164 src/layer/tile/CalcTileLayer.js:120 #: src/layer/tile/ImpressTileLayer.js:155 src/layer/tile/WriterTileLayer.js:100 msgid "Always follow the editor" msgstr "" -#: src/control/Control.Toolbar.js:1163 src/layer/tile/CalcTileLayer.js:123 +#: src/control/Control.Toolbar.js:1167 src/layer/tile/CalcTileLayer.js:123 #: src/layer/tile/ImpressTileLayer.js:158 src/layer/tile/WriterTileLayer.js:103 msgid "Current" msgstr "" -#: src/control/Control.Toolbar.js:1246 +#: src/control/Control.Toolbar.js:1250 msgid "%user has joined" msgstr "" -#: src/control/Control.Toolbar.js:1247 +#: src/control/Control.Toolbar.js:1251 msgid "%user has left" msgstr "" -#: src/control/Control.Toolbar.js:1609 +#: src/control/Control.Toolbar.js:1613 #, fuzzy msgid "Number of Sheets" msgstr "Aantal Aansig" -#: src/control/Control.Toolbar.js:1614 +#: src/control/Control.Toolbar.js:1618 msgid "Selected range of cells" msgstr "" -#: src/control/Control.Toolbar.js:1619 src/control/Control.Toolbar.js:1676 +#: src/control/Control.Toolbar.js:1623 src/control/Control.Toolbar.js:1680 msgid "Entering text mode" msgstr "" -#: src/control/Control.Toolbar.js:1628 src/control/Control.Toolbar.js:1681 +#: src/control/Control.Toolbar.js:1632 src/control/Control.Toolbar.js:1685 msgid "Selection Mode" msgstr "" -#: src/control/Control.Toolbar.js:1633 +#: src/control/Control.Toolbar.js:1637 msgid "Choice of functions" msgstr "" -#: src/control/Control.Toolbar.js:1637 +#: src/control/Control.Toolbar.js:1641 msgid "Average" msgstr "" -#: src/control/Control.Toolbar.js:1638 +#: src/control/Control.Toolbar.js:1642 msgid "CountA" msgstr "" -#: src/control/Control.Toolbar.js:1639 +#: src/control/Control.Toolbar.js:1643 msgid "Count" msgstr "" -#: src/control/Control.Toolbar.js:1640 +#: src/control/Control.Toolbar.js:1644 msgid "Maximum" msgstr "" -#: src/control/Control.Toolbar.js:1641 +#: src/control/Control.Toolbar.js:1645 msgid "Minimum" msgstr "" -#: src/control/Control.Toolbar.js:1642 +#: src/control/Control.Toolbar.js:1646 msgid "Sum" msgstr "" -#: src/control/Control.Toolbar.js:1643 +#: src/control/Control.Toolbar.js:1647 msgid "Selection count" msgstr "" -#: src/control/Control.Toolbar.js:1666 +#: src/control/Control.Toolbar.js:1670 #, fuzzy msgid "Number of Pages" msgstr "Aantal Aansig" -#: src/control/Control.Toolbar.js:1671 +#: src/control/Control.Toolbar.js:1675 msgid "Word Counter" msgstr "" -#: src/control/Control.Toolbar.js:1706 +#: src/control/Control.Toolbar.js:1710 #, fuzzy msgid "Number of Slides" msgstr "Aantal Aansig" -#: src/control/Control.Toolbar.js:1746 +#: src/control/Control.Toolbar.js:1750 msgid "%n users" msgstr "" -#: src/control/Control.Toolbar.js:1747 +#: src/control/Control.Toolbar.js:1751 msgid "1 user" msgstr "" -#: src/control/Control.Toolbar.js:1748 +#: src/control/Control.Toolbar.js:1752 msgid "0 users" msgstr "" -#: src/control/Control.Toolbar.js:2150 +#: src/control/Control.Toolbar.js:2154 msgid "Style" msgstr "" -#: src/control/Control.Toolbar.js:2173 +#: src/control/Control.Toolbar.js:2177 msgid "Font" msgstr "" -#: src/control/Control.Toolbar.js:2199 +#: src/control/Control.Toolbar.js:2203 msgid "Previous slide" msgstr "" -#: src/control/Control.Toolbar.js:2200 +#: src/control/Control.Toolbar.js:2204 msgid "Next slide" msgstr "" -#: src/control/Control.Toolbar.js:2258 +#: src/control/Control.Toolbar.js:2262 msgid "Conflict Undo/Redo with multiple users. Please use document repair to resolve" msgstr "" -#: src/control/Control.Toolbar.js:2545 +#: src/control/Control.Toolbar.js:2549 msgid "Readonly" msgstr "" @@ -892,7 +906,7 @@ msgstr "" msgid "Downloading..." msgstr "Laai af" -#: src/control/Toolbar.js:104 src/map/Map.js:1399 +#: src/control/Toolbar.js:104 src/map/Map.js:1409 msgid "Saving..." msgstr "Stoor..." @@ -916,10 +930,6 @@ msgstr "" msgid "Link" msgstr "" -#: src/control/Toolbar.js:455 -msgid "OK" -msgstr "" - #: src/core/Socket.js:59 msgid "IE11 has reached its maximum number of connections. Please see this document to increase this limit if needed: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections" msgstr "" @@ -996,7 +1006,7 @@ msgstr "" msgid "Wrong password provided. Please try again." msgstr "" -#: src/core/Socket.js:751 src/map/Map.js:1402 +#: src/core/Socket.js:751 src/map/Map.js:1412 msgid "Loading..." msgstr "" @@ -1161,15 +1171,15 @@ msgstr "" msgid "Failed to download clipboard, please re-copy" msgstr "" -#: src/map/Clipboard.js:767 +#: src/map/Clipboard.js:771 msgid "<p>Please use the copy/paste buttons on your on-screen keyboard.</p>" msgstr "" -#: src/map/Clipboard.js:792 +#: src/map/Clipboard.js:796 msgid "<p>If you would like to share larger elements of your document with other applications it is necessary to first download them onto your device. To do that press the \"Start download\" button below, and when complete click \"Confirm copy to clipboard\".</p><p>If you are copy and pasting between documents inside %productName, there is no need to download.</p>" msgstr "" -#: src/map/Clipboard.js:808 +#: src/map/Clipboard.js:812 msgid "<p>A download due to a large copy/paste operation has already started. Please, wait for the current download or cancel it before starting a new one</p>" msgstr "" @@ -1187,7 +1197,7 @@ msgstr "" msgid "%d minutes ago" msgstr "" -#: src/map/Map.js:1263 +#: src/map/Map.js:1273 msgid "Inactive document - please click to resume editing" msgstr "" diff --git a/loleaflet/po/ui-am.po b/loleaflet/po/ui-am.po index f90e99785..7d74b93d8 100644 --- a/loleaflet/po/ui-am.po +++ b/loleaflet/po/ui-am.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-12 11:04+0100\n" +"POT-Creation-Date: 2020-02-21 14:50+0100\n" "PO-Revision-Date: 2020-02-03 13:38+0000\n" "Last-Translator: Adolfo Jayme Barrientos <f...@libreoffice.org>\n" "Language-Team: Amharic <https://weblate.documentfoundation.org/projects/libo_online/loleaflet-ui/am/>\n" @@ -121,7 +121,7 @@ msgid "Network Graph" msgstr "የ ኔትዎርክ ድጋፍ" #: admin/admin.strings.js:31 src/layer/marker/Annotation.js:252 -#: src/layer/tile/TileLayer.js:379 +#: src/layer/tile/TileLayer.js:380 msgid "Save" msgstr "ማስቀመጫ" @@ -189,7 +189,22 @@ msgstr "የ ግንኙነት ስህተት" msgid "Are you sure you want to terminate this session?" msgstr "በ እርግጥ ይህን ክፍል ጊዜ ማጥፋት ይፈልጋሉ?" -#: admin/src/AdminSocketOverview.js:186 admin/src/AdminSocketOverview.js:288 +#: admin/src/AdminSocketOverview.js:107 admin/src/AdminSocketSettings.js:36 +#: src/control/Control.Menubar.js:1149 src/control/Control.Tabs.js:179 +#: src/control/Control.Tabs.js:196 src/control/Control.Toolbar.js:246 +#: src/control/Toolbar.js:455 +msgid "OK" +msgstr "" + +#: admin/src/AdminSocketOverview.js:108 admin/src/AdminSocketSettings.js:37 +#: src/control/Control.LanguageDialog.js:86 src/control/Control.Menubar.js:1150 +#: src/control/Control.Tabs.js:180 src/control/Control.Tabs.js:197 +#: src/control/Control.Toolbar.js:247 src/control/Toolbar.js:456 +#: src/layer/marker/Annotation.js:183 src/layer/tile/TileLayer.js:381 +msgid "Cancel" +msgstr "መሰረዣ" + +#: admin/src/AdminSocketOverview.js:190 admin/src/AdminSocketOverview.js:292 msgid "Documents" msgstr "ሰነዶች" @@ -241,11 +256,11 @@ msgstr "ማረሚያ" msgid "The server encountered a %0 error while parsing the %1 command." msgstr "ይህ ሰርቨር %0 ስህተት ገጥሞታል ትእዛዙን በ መተንተን ላይ %1 እንዳለ" -#: src/control/Control.ContextMenu.js:174 +#: src/control/Control.ContextMenu.js:171 msgid "Delete" msgstr "" -#: src/control/Control.ContextMenu.js:259 +#: src/control/Control.ContextMenu.js:255 msgid "Paste Special" msgstr "የተለየ መለጠፊያ" @@ -277,7 +292,7 @@ msgstr "የ ጊዜ ማህተም" msgid "Jump to state" msgstr "ወደ ሁኔታ መዝለያ" -#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2539 +#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2543 msgid "You" msgstr "እርስዎ" @@ -329,130 +344,129 @@ msgstr "" msgid "Fixed size" msgstr "" -#: src/control/Control.JSDialogBuilder.js:759 -#: src/control/Control.Toolbar.js:1644 +#: src/control/Control.JSDialogBuilder.js:766 +#: src/control/Control.Toolbar.js:1648 msgid "None" msgstr "ምንም" -#: src/control/Control.JSDialogBuilder.js:762 +#: src/control/Control.JSDialogBuilder.js:769 msgid "Color" msgstr "" -#: src/control/Control.JSDialogBuilder.js:765 +#: src/control/Control.JSDialogBuilder.js:772 msgid "Gradient" msgstr "" -#: src/control/Control.JSDialogBuilder.js:768 +#: src/control/Control.JSDialogBuilder.js:775 msgid "Hatching" msgstr "" -#: src/control/Control.JSDialogBuilder.js:772 +#: src/control/Control.JSDialogBuilder.js:779 msgid "Pattern" msgstr "" -#: src/control/Control.JSDialogBuilder.js:905 +#: src/control/Control.JSDialogBuilder.js:912 msgid "From" msgstr "" -#: src/control/Control.JSDialogBuilder.js:908 +#: src/control/Control.JSDialogBuilder.js:915 msgid "To" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1040 +#: src/control/Control.JSDialogBuilder.js:1050 #, fuzzy #| msgid "Font" msgid "Font Name" msgstr "ፊደል" -#: src/control/Control.JSDialogBuilder.js:1042 +#: src/control/Control.JSDialogBuilder.js:1052 #, fuzzy #| msgid "Font" msgid "Font Size" msgstr "ፊደል" -#: src/control/Control.JSDialogBuilder.js:1518 +#: src/control/Control.JSDialogBuilder.js:1533 msgid "Rows" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1519 +#: src/control/Control.JSDialogBuilder.js:1534 msgid "Columns" msgstr "" -#: src/control/Control.JSDialogBuilder.js:1539 -#: src/control/Control.Toolbar.js:969 +#: src/control/Control.JSDialogBuilder.js:1554 +#: src/control/Control.Toolbar.js:973 msgid "Insert table" msgstr "ሰንጠረዥ ማስገቢያ" +#: src/control/Control.JSDialogBuilder.js:1583 +msgid "Line style:" +msgstr "" + #: src/control/Control.LanguageDialog.js:69 src/control/Control.Menubar.js:227 #: src/control/Control.Menubar.js:229 src/control/Control.Menubar.js:231 -#: src/control/Control.Menubar.js:338 src/control/Control.Menubar.js:453 -#: src/control/Control.Toolbar.js:2055 +#: src/control/Control.Menubar.js:337 src/control/Control.Menubar.js:452 +#: src/control/Control.Toolbar.js:2059 msgid "None (Do not check spelling)" msgstr "ምንም (ፊደሉን አታርም)" -#: src/control/Control.LanguageDialog.js:86 src/control/Toolbar.js:456 -#: src/layer/marker/Annotation.js:183 src/layer/tile/TileLayer.js:380 -msgid "Cancel" -msgstr "መሰረዣ" - #: src/control/Control.Menubar.js:21 src/control/Control.Menubar.js:251 -#: src/control/Control.Menubar.js:353 src/control/Control.Menubar.js:469 -#: src/control/Control.Menubar.js:517 src/control/Control.Menubar.js:562 +#: src/control/Control.Menubar.js:352 src/control/Control.Menubar.js:468 +#: src/control/Control.Menubar.js:516 src/control/Control.Menubar.js:561 msgid "Share..." msgstr "ማካፈያ..." #: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:253 -#: src/control/Control.Menubar.js:355 src/control/Control.Menubar.js:471 -#: src/control/Control.Menubar.js:519 src/control/Control.Menubar.js:564 +#: src/control/Control.Menubar.js:354 src/control/Control.Menubar.js:470 +#: src/control/Control.Menubar.js:518 src/control/Control.Menubar.js:563 msgid "See revision history" msgstr "የ ክለሳ ታሪኩን ይመልከቱ" #: src/control/Control.Menubar.js:24 src/control/Control.Menubar.js:254 -#: src/control/Control.Menubar.js:356 src/control/Control.Menubar.js:474 -#: src/control/Control.Menubar.js:521 src/control/Control.Menubar.js:566 +#: src/control/Control.Menubar.js:355 src/control/Control.Menubar.js:473 +#: src/control/Control.Menubar.js:520 src/control/Control.Menubar.js:565 msgid "Download as" msgstr "የወረዱ" #: src/control/Control.Menubar.js:25 src/control/Control.Menubar.js:255 -#: src/control/Control.Menubar.js:357 src/control/Control.Menubar.js:475 -#: src/control/Control.Menubar.js:522 src/control/Control.Menubar.js:567 +#: src/control/Control.Menubar.js:356 src/control/Control.Menubar.js:474 +#: src/control/Control.Menubar.js:521 src/control/Control.Menubar.js:566 msgid "PDF Document (.pdf)" msgstr "PDF ሰነድ (.pdf)" -#: src/control/Control.Menubar.js:26 src/control/Control.Menubar.js:476 +#: src/control/Control.Menubar.js:26 src/control/Control.Menubar.js:475 msgid "ODF text document (.odt)" msgstr "የ ODF ጽሁፍ ሰነድ (.odt)" -#: src/control/Control.Menubar.js:27 src/control/Control.Menubar.js:477 +#: src/control/Control.Menubar.js:27 src/control/Control.Menubar.js:476 msgid "Word 2003 Document (.doc)" msgstr "Word 2003 Document (.doc)" -#: src/control/Control.Menubar.js:28 src/control/Control.Menubar.js:478 +#: src/control/Control.Menubar.js:28 src/control/Control.Menubar.js:477 msgid "Word Document (.docx)" msgstr "Word Document (.docx)" -#: src/control/Control.Menubar.js:29 src/control/Control.Menubar.js:479 +#: src/control/Control.Menubar.js:29 src/control/Control.Menubar.js:478 msgid "Rich Text (.rtf)" msgstr "ሀብታም ጽሁፍ (.rtf)" -#: src/control/Control.Menubar.js:30 src/control/Control.Menubar.js:472 +#: src/control/Control.Menubar.js:30 src/control/Control.Menubar.js:471 #: src/control/Signing.js:601 msgid "Sign document" msgstr "ሰነድ መፈረሚያ" #: src/control/Control.Menubar.js:32 src/control/Control.Menubar.js:260 -#: src/control/Control.Menubar.js:362 +#: src/control/Control.Menubar.js:361 msgid "Close document" msgstr "ሰነድ መዝጊያ" #: src/control/Control.Menubar.js:37 src/control/Control.Menubar.js:265 -#: src/control/Control.Menubar.js:367 src/control/Control.Menubar.js:484 -#: src/control/Control.Menubar.js:530 src/control/Control.Menubar.js:575 +#: src/control/Control.Menubar.js:366 src/control/Control.Menubar.js:483 +#: src/control/Control.Menubar.js:529 src/control/Control.Menubar.js:574 msgid "Repair" msgstr "መጠገኛ" #: src/control/Control.Menubar.js:63 src/control/Control.Menubar.js:279 -#: src/control/Control.Toolbar.js:1170 +#: src/control/Control.Toolbar.js:1174 msgid "Reset zoom" msgstr "እንደነበር መመለሻ ማሳያውን" @@ -461,13 +475,13 @@ msgid "Show Ruler" msgstr "" #: src/control/Control.Menubar.js:74 src/control/Control.Menubar.js:291 -#: src/control/Control.Menubar.js:382 src/control/Control.Menubar.js:623 -#: src/control/Control.Menubar.js:663 src/control/Control.Menubar.js:676 +#: src/control/Control.Menubar.js:381 src/control/Control.Menubar.js:622 +#: src/control/Control.Menubar.js:662 src/control/Control.Menubar.js:675 msgid "Local Image..." msgstr "የ አካባቢ ምስል..." #: src/control/Control.Menubar.js:91 src/control/Control.Menubar.js:93 -#: src/control/Control.Menubar.js:639 src/control/Control.Menubar.js:641 +#: src/control/Control.Menubar.js:638 src/control/Control.Menubar.js:640 msgid "All" msgstr "ሁሉንም" @@ -475,87 +489,87 @@ msgstr "ሁሉንም" msgid "Text orientation" msgstr "የ ጽሁፍ አቅጣጫ" -#: src/control/Control.Menubar.js:239 src/control/Control.Menubar.js:341 -#: src/control/Control.Menubar.js:457 +#: src/control/Control.Menubar.js:239 src/control/Control.Menubar.js:340 +#: src/control/Control.Menubar.js:456 msgid "Online Help" msgstr "" -#: src/control/Control.Menubar.js:240 src/control/Control.Menubar.js:342 -#: src/control/Control.Menubar.js:458 +#: src/control/Control.Menubar.js:240 src/control/Control.Menubar.js:341 +#: src/control/Control.Menubar.js:457 msgid "Keyboard shortcuts" msgstr "የ ፊደል ገበታ አቋራጭ" -#: src/control/Control.Menubar.js:241 src/control/Control.Menubar.js:343 -#: src/control/Control.Menubar.js:459 +#: src/control/Control.Menubar.js:241 src/control/Control.Menubar.js:342 +#: src/control/Control.Menubar.js:458 msgid "Report an issue" msgstr "" -#: src/control/Control.Menubar.js:242 src/control/Control.Menubar.js:344 -#: src/control/Control.Menubar.js:460 src/control/Control.Menubar.js:510 -#: src/control/Control.Menubar.js:555 src/control/Control.Menubar.js:617 +#: src/control/Control.Menubar.js:242 src/control/Control.Menubar.js:343 +#: src/control/Control.Menubar.js:459 src/control/Control.Menubar.js:509 +#: src/control/Control.Menubar.js:554 src/control/Control.Menubar.js:616 msgid "About" msgstr "ስለ" -#: src/control/Control.Menubar.js:244 src/control/Control.Menubar.js:346 -#: src/control/Control.Menubar.js:462 src/map/Map.js:389 +#: src/control/Control.Menubar.js:244 src/control/Control.Menubar.js:345 +#: src/control/Control.Menubar.js:461 src/map/Map.js:389 msgid "Last modification" msgstr "መጨረሻ የ ተሻሻለው" -#: src/control/Control.Menubar.js:256 src/control/Control.Menubar.js:523 +#: src/control/Control.Menubar.js:256 src/control/Control.Menubar.js:522 msgid "ODF presentation (.odp)" msgstr "የ ODF ማቅረቢያ (.odp)" -#: src/control/Control.Menubar.js:257 src/control/Control.Menubar.js:524 +#: src/control/Control.Menubar.js:257 src/control/Control.Menubar.js:523 msgid "PowerPoint 2003 Presentation (.ppt)" msgstr "PowerPoint 2003 Presentation (.ppt)" -#: src/control/Control.Menubar.js:258 src/control/Control.Menubar.js:525 +#: src/control/Control.Menubar.js:258 src/control/Control.Menubar.js:524 msgid "PowerPoint Presentation (.pptx)" msgstr "PowerPoint Presentation (.pptx)" -#: src/control/Control.Menubar.js:332 src/control/Control.Menubar.js:554 -#: src/control/Control.Toolbar.js:1123 +#: src/control/Control.Menubar.js:331 src/control/Control.Menubar.js:553 +#: src/control/Control.Toolbar.js:1127 msgid "Fullscreen presentation" msgstr "በ ሙሉ መመልከቻ ማቅረቢያ" -#: src/control/Control.Menubar.js:358 src/control/Control.Menubar.js:568 +#: src/control/Control.Menubar.js:357 src/control/Control.Menubar.js:567 msgid "ODF spreadsheet (.ods)" msgstr "የ ODF ሰንጠረዥ (.ods)" -#: src/control/Control.Menubar.js:359 src/control/Control.Menubar.js:569 +#: src/control/Control.Menubar.js:358 src/control/Control.Menubar.js:568 msgid "Excel 2003 Spreadsheet (.xls)" msgstr "Excel 2003 Spreadsheet (.xls)" -#: src/control/Control.Menubar.js:360 src/control/Control.Menubar.js:570 +#: src/control/Control.Menubar.js:359 src/control/Control.Menubar.js:569 msgid "Excel Spreadsheet (.xlsx)" msgstr "Excel Spreadsheet (.xlsx)" -#: src/control/Control.Menubar.js:474 src/control/Control.Menubar.js:521 -#: src/control/Control.Menubar.js:566 +#: src/control/Control.Menubar.js:473 src/control/Control.Menubar.js:520 +#: src/control/Control.Menubar.js:565 msgid "Export as" msgstr "" -#: src/control/Control.Menubar.js:500 +#: src/control/Control.Menubar.js:499 msgid "Page Setup" msgstr "" -#: src/control/Control.Menubar.js:501 +#: src/control/Control.Menubar.js:500 msgid "Portrait" msgstr "" -#: src/control/Control.Menubar.js:502 +#: src/control/Control.Menubar.js:501 msgid "Landscape" msgstr "" -#: src/control/Control.Menubar.js:763 src/control/Control.Toolbar.js:2054 +#: src/control/Control.Menubar.js:762 src/control/Control.Toolbar.js:2058 msgid "Reset to Default Language" msgstr "ነባሩን ቋንቋ እንደ ነበረ መመለሻ" -#: src/control/Control.Menubar.js:1148 +#: src/control/Control.Menubar.js:1147 msgid "Are you sure you want to delete this slide?" msgstr "በ እርግጥ ይህን ተንሸራታች ማጥፋት ይፈልጋሉ?" -#: src/control/Control.Menubar.js:1182 src/map/Clipboard.js:769 +#: src/control/Control.Menubar.js:1185 src/map/Clipboard.js:773 msgid "<p>Your browser has very limited access to the clipboard, so use these keyboard shortcuts:<ul><li><b>Ctrl+C</b>: For copying.</li><li><b>Ctrl+X</b>: For cutting.</li><li><b>Ctrl+V</b>: For pasting.</li></ul></p>" msgstr "" @@ -579,7 +593,7 @@ msgstr "ከዚህ በኋላ ወረቀት ማስገቢያ" msgid "Are you sure you want to delete sheet, %sheet% ?" msgstr "በ እርግጥ ይህን ወረቀት ማጥፋት ይፈልጋሉ %sheet% ?" -#: src/control/Control.Tabs.js:190 +#: src/control/Control.Tabs.js:194 msgid "Enter new sheet name" msgstr "አዲስ የ ወረቀት ስም ያስገቡ" @@ -587,171 +601,171 @@ msgstr "አዲስ የ ወረቀት ስም ያስገቡ" msgid "Are you sure you want to delete this page?" msgstr "በ እርግጥ ይህን ገጽ ማጥፋት ይፈልጋሉ?" -#: src/control/Control.Toolbar.js:856 +#: src/control/Control.Toolbar.js:860 msgid "Default Style" msgstr "" -#: src/control/Control.Toolbar.js:913 +#: src/control/Control.Toolbar.js:917 msgid "Borders" msgstr "ድንበሮች" -#: src/control/Control.Toolbar.js:921 +#: src/control/Control.Toolbar.js:925 msgid "More..." msgstr "ተጨማሪ..." -#: src/control/Control.Toolbar.js:974 +#: src/control/Control.Toolbar.js:978 msgid "Insert Local Image" msgstr "የ አካባቢ ምስል ማስገቢያ" -#: src/control/Control.Toolbar.js:978 +#: src/control/Control.Toolbar.js:982 msgid "Insert shapes" msgstr "ቅርጾች ማስገቢያ" -#: src/control/Control.Toolbar.js:1057 +#: src/control/Control.Toolbar.js:1061 #, fuzzy #| msgid "Function" msgid "Function Wizard" msgstr "ተግባር" -#: src/control/Control.Toolbar.js:1101 +#: src/control/Control.Toolbar.js:1105 msgid "First sheet" msgstr "የ መጀመሪያ ወረቀት" -#: src/control/Control.Toolbar.js:1102 +#: src/control/Control.Toolbar.js:1106 msgid "Previous sheet" msgstr "ያለፈው ወረቀት" -#: src/control/Control.Toolbar.js:1103 +#: src/control/Control.Toolbar.js:1107 msgid "Next sheet" msgstr "የሚቀጥለው ወረቀት" -#: src/control/Control.Toolbar.js:1104 +#: src/control/Control.Toolbar.js:1108 msgid "Last sheet" msgstr "የ መጨረሻው ወረቀት" -#: src/control/Control.Toolbar.js:1105 src/layer/tile/CalcTileLayer.js:179 +#: src/control/Control.Toolbar.js:1109 src/layer/tile/CalcTileLayer.js:179 msgid "Insert sheet" msgstr "ወረቀት ማስገቢያ" -#: src/control/Control.Toolbar.js:1147 +#: src/control/Control.Toolbar.js:1151 msgid "Search" msgstr "መፈለጊያ:" -#: src/control/Control.Toolbar.js:1153 +#: src/control/Control.Toolbar.js:1157 msgid "Cancel the search" msgstr "ፍለጋውን መሰረዣ" -#: src/control/Control.Toolbar.js:1160 src/layer/tile/CalcTileLayer.js:120 +#: src/control/Control.Toolbar.js:1164 src/layer/tile/CalcTileLayer.js:120 #: src/layer/tile/ImpressTileLayer.js:155 src/layer/tile/WriterTileLayer.js:100 msgid "Always follow the editor" msgstr "ሁል ጊዜ ማረሚያውን መከተያ" -#: src/control/Control.Toolbar.js:1163 src/layer/tile/CalcTileLayer.js:123 +#: src/control/Control.Toolbar.js:1167 src/layer/tile/CalcTileLayer.js:123 #: src/layer/tile/ImpressTileLayer.js:158 src/layer/tile/WriterTileLayer.js:103 msgid "Current" msgstr "የ አሁኑ" -#: src/control/Control.Toolbar.js:1246 +#: src/control/Control.Toolbar.js:1250 msgid "%user has joined" msgstr "%ተጠቃሚ ገብቷል" -#: src/control/Control.Toolbar.js:1247 +#: src/control/Control.Toolbar.js:1251 msgid "%user has left" msgstr "%ተጠቃሚ ወጥቷል" -#: src/control/Control.Toolbar.js:1609 +#: src/control/Control.Toolbar.js:1613 msgid "Number of Sheets" msgstr "የ ወረቀቶች ቁጥር" -#: src/control/Control.Toolbar.js:1614 +#: src/control/Control.Toolbar.js:1618 msgid "Selected range of cells" msgstr "የ ተመረጡት ክፍሎች መጠን" -#: src/control/Control.Toolbar.js:1619 src/control/Control.Toolbar.js:1676 +#: src/control/Control.Toolbar.js:1623 src/control/Control.Toolbar.js:1680 msgid "Entering text mode" msgstr "ወደ ጽሁፍ ዘዴ መግቢያ" -#: src/control/Control.Toolbar.js:1628 src/control/Control.Toolbar.js:1681 +#: src/control/Control.Toolbar.js:1632 src/control/Control.Toolbar.js:1685 msgid "Selection Mode" msgstr "መምረጫ ዘዴ" -#: src/control/Control.Toolbar.js:1633 +#: src/control/Control.Toolbar.js:1637 msgid "Choice of functions" msgstr "የ ተግባሮች ምርጫ" -#: src/control/Control.Toolbar.js:1637 +#: src/control/Control.Toolbar.js:1641 msgid "Average" msgstr "መካከለኛ" -#: src/control/Control.Toolbar.js:1638 +#: src/control/Control.Toolbar.js:1642 msgid "CountA" msgstr "መቁጠሪያA" -#: src/control/Control.Toolbar.js:1639 +#: src/control/Control.Toolbar.js:1643 msgid "Count" msgstr "መቁጠሪያ" -#: src/control/Control.Toolbar.js:1640 +#: src/control/Control.Toolbar.js:1644 msgid "Maximum" msgstr "ከፍተኛ" -#: src/control/Control.Toolbar.js:1641 +#: src/control/Control.Toolbar.js:1645 msgid "Minimum" msgstr "አነስተኛ" -#: src/control/Control.Toolbar.js:1642 +#: src/control/Control.Toolbar.js:1646 msgid "Sum" msgstr "ድምር" -#: src/control/Control.Toolbar.js:1643 +#: src/control/Control.Toolbar.js:1647 msgid "Selection count" msgstr "መምረጫ መቁጠሪያ" -#: src/control/Control.Toolbar.js:1666 +#: src/control/Control.Toolbar.js:1670 msgid "Number of Pages" msgstr "የ ገጾች ቁጥር" -#: src/control/Control.Toolbar.js:1671 +#: src/control/Control.Toolbar.js:1675 msgid "Word Counter" msgstr "ቃላት ቆጣሪ" -#: src/control/Control.Toolbar.js:1706 +#: src/control/Control.Toolbar.js:1710 msgid "Number of Slides" msgstr "የ ተንሸራታቾች ቁጥር" -#: src/control/Control.Toolbar.js:1746 +#: src/control/Control.Toolbar.js:1750 msgid "%n users" msgstr "%n ተጠቃሚዎች" -#: src/control/Control.Toolbar.js:1747 +#: src/control/Control.Toolbar.js:1751 msgid "1 user" msgstr "1 ተጠቃሚ" -#: src/control/Control.Toolbar.js:1748 +#: src/control/Control.Toolbar.js:1752 msgid "0 users" msgstr "0 ተጠቃሚዎች" -#: src/control/Control.Toolbar.js:2150 +#: src/control/Control.Toolbar.js:2154 msgid "Style" msgstr "ዘዴ" -#: src/control/Control.Toolbar.js:2173 +#: src/control/Control.Toolbar.js:2177 msgid "Font" msgstr "ፊደል" -#: src/control/Control.Toolbar.js:2199 +#: src/control/Control.Toolbar.js:2203 msgid "Previous slide" msgstr "ቀደም ያለው ተንሸራታች" -#: src/control/Control.Toolbar.js:2200 +#: src/control/Control.Toolbar.js:2204 msgid "Next slide" msgstr "የሚቀጥለው ተንሸራታች" -#: src/control/Control.Toolbar.js:2258 +#: src/control/Control.Toolbar.js:2262 msgid "Conflict Undo/Redo with multiple users. Please use document repair to resolve" msgstr "ግጭት መተው/እንደገና መስሪያ ከ በርካታ ተጠቃሚዎች ጋር: እባክዎን የ ሰነድ መጠገኛ ይጠቀሙ ችግሩን ለ መፍታት" -#: src/control/Control.Toolbar.js:2545 +#: src/control/Control.Toolbar.js:2549 msgid "Readonly" msgstr "ለ ንባብ ብቻ" @@ -891,7 +905,7 @@ msgstr "" msgid "Downloading..." msgstr "በማውረድ ላይ..." -#: src/control/Toolbar.js:104 src/map/Map.js:1399 +#: src/control/Toolbar.js:104 src/map/Map.js:1409 msgid "Saving..." msgstr "በማስቀመጥ ላይ..." @@ -915,10 +929,6 @@ msgstr "" msgid "Link" msgstr "" -#: src/control/Toolbar.js:455 -msgid "OK" -msgstr "" - #: src/core/Socket.js:59 msgid "IE11 has reached its maximum number of connections. Please see this document to increase this limit if needed: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections" msgstr "" @@ -995,7 +1005,7 @@ msgstr "ይጫኑ መሰረዣ ለ መክፈት በ መመልከቻ-ብቻ ዘ msgid "Wrong password provided. Please try again." msgstr "የ ተሳሳተ የ መግቢያ ቃል: እባክዎን እንደገና ይሞክሩ" -#: src/core/Socket.js:751 src/map/Map.js:1402 +#: src/core/Socket.js:751 src/map/Map.js:1412 msgid "Loading..." msgstr "በመጫን ላይ..." @@ -1166,15 +1176,15 @@ msgstr "" msgid "Failed to download clipboard, please re-copy" msgstr "" -#: src/map/Clipboard.js:767 +#: src/map/Clipboard.js:771 msgid "<p>Please use the copy/paste buttons on your on-screen keyboard.</p>" msgstr "" -#: src/map/Clipboard.js:792 +#: src/map/Clipboard.js:796 msgid "<p>If you would like to share larger elements of your document with other applications it is necessary to first download them onto your device. To do that press the \"Start download\" button below, and when complete click \"Confirm copy to clipboard\".</p><p>If you are copy and pasting between documents inside %productName, there is no need to download.</p>" msgstr "" -#: src/map/Clipboard.js:808 +#: src/map/Clipboard.js:812 msgid "<p>A download due to a large copy/paste operation has already started. Please, wait for the current download or cancel it before starting a new one</p>" msgstr "" @@ -1192,7 +1202,7 @@ msgstr "%d ሰከንዶች በፊት" msgid "%d minutes ago" msgstr "%d ደቂቃዎች በፊት" -#: src/map/Map.js:1263 +#: src/map/Map.js:1273 msgid "Inactive document - please click to resume editing" msgstr "ንቁ ያልሆነ ሰነድ - እባክዎን ይጫኑ ማረም ለ መቀጠል" diff --git a/loleaflet/po/ui-an.po b/loleaflet/po/ui-an.po index 9e3e1bb5d..d6eb092e3 100644 --- a/loleaflet/po/ui-an.po +++ b/loleaflet/po/ui-an.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-12 11:04+0100\n" +"POT-Creation-Date: 2020-02-21 14:50+0100\n" "PO-Revision-Date: 2020-01-07 10:57+0000\n" "Last-Translator: Adolfo Jayme Barrientos <f...@libreoffice.org>\n" "Language-Team: Aragonese <https://weblate.documentfoundation.org/projects/libo_online/loleaflet-ui/an/>\n" @@ -121,7 +121,7 @@ msgid "Network Graph" msgstr "" #: admin/admin.strings.js:31 src/layer/marker/Annotation.js:252 -#: src/layer/tile/TileLayer.js:379 +#: src/layer/tile/TileLayer.js:380 msgid "Save" msgstr "" @@ -189,7 +189,22 @@ msgstr "" msgid "Are you sure you want to terminate this session?" msgstr "" -#: admin/src/AdminSocketOverview.js:186 admin/src/AdminSocketOverview.js:288 +#: admin/src/AdminSocketOverview.js:107 admin/src/AdminSocketSettings.js:36 +#: src/control/Control.Menubar.js:1149 src/control/Control.Tabs.js:179 +#: src/control/Control.Tabs.js:196 src/control/Control.Toolbar.js:246 +#: src/control/Toolbar.js:455 +msgid "OK" +msgstr "" + +#: admin/src/AdminSocketOverview.js:108 admin/src/AdminSocketSettings.js:37 +#: src/control/Control.LanguageDialog.js:86 src/control/Control.Menubar.js:1150 +#: src/control/Control.Tabs.js:180 src/control/Control.Tabs.js:197 +#: src/control/Control.Toolbar.js:247 src/control/Toolbar.js:456 +#: src/layer/marker/Annotation.js:183 src/layer/tile/TileLayer.js:381 +msgid "Cancel" +msgstr "" + +#: admin/src/AdminSocketOverview.js:190 admin/src/AdminSocketOverview.js:292 msgid "Documents" msgstr "" @@ -241,11 +256,11 @@ msgstr "" ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits