Skip to content
This repository was archived by the owner on Jan 22, 2022. It is now read-only.

Commit 290aee3

Browse files
authored
Merge branch 'xenial_-_combine' into xenial_-_fullscreenhint
2 parents 601e037 + 7b65526 commit 290aee3

99 files changed

Lines changed: 5649 additions & 4188 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

clickable.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"template": "cmake",
33
"kill": "morph-browser",
4+
"qt_version": "5.12",
45
"build_args": "-DCLICK_MODE=ON",
56
"dependencies_target": [
67
"qtwebengine5-dev"

po/aa.po

Lines changed: 57 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: morph-browser\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-12-20 13:28+0000\n"
10+
"POT-Creation-Date: 2020-07-18 19:58+0000\n"
1111
"PO-Revision-Date: 2016-02-14 22:31+0000\n"
1212
"Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n"
1313
"Language-Team: Afar <aa@li.org>\n"
@@ -60,8 +60,8 @@ msgstr "Oggol"
6060
#: src/app/CertificateVerificationDialog.qml:46
6161
#: src/app/ColorSelectDialog.qml:84 src/app/ConfirmDialog.qml:41
6262
#: src/app/DownloadDelegate.qml:159 src/app/HttpAuthenticationDialog.qml:80
63-
#: src/app/PromptDialog.qml:61 src/app/SavePageDialog.qml:52
64-
#: src/app/ZoomControls.qml:225 src/app/webbrowser/BookmarkOptions.qml:164
63+
#: src/app/PromptDialog.qml:61 src/app/SavePageDialog.qml:73
64+
#: src/app/ZoomControls.qml:229 src/app/webbrowser/BookmarkOptions.qml:164
6565
#: src/app/webbrowser/ContentDownloadDialog.qml:114
6666
#: src/app/webbrowser/ContextMenuMobile.qml:143
6767
#: src/app/webbrowser/SettingsPage.qml:438
@@ -158,13 +158,13 @@ msgid "Custom User Agents"
158158
msgstr ""
159159

160160
#: src/app/CustomUserAgentsPage.qml:57 src/app/DomainPermissionsPage.qml:69
161-
#: src/app/DomainSettingsPage.qml:66 src/app/DownloadsPage.qml:82
161+
#: src/app/DomainSettingsPage.qml:66 src/app/DownloadsPage.qml:85
162162
#: src/app/actions/SelectAll.qml:22
163163
msgid "Select all"
164164
msgstr "Inkig meex"
165165

166166
#: src/app/CustomUserAgentsPage.qml:73 src/app/DomainPermissionsPage.qml:85
167-
#: src/app/DomainSettingsPage.qml:82 src/app/DownloadsPage.qml:98
167+
#: src/app/DomainSettingsPage.qml:82 src/app/DownloadsPage.qml:101
168168
msgid "Delete"
169169
msgstr "Dug"
170170

@@ -265,16 +265,16 @@ msgstr ""
265265
msgid "Resume"
266266
msgstr "Qagit"
267267

268-
#: src/app/DownloadsPage.qml:44 src/app/webbrowser/Browser.qml:768
268+
#: src/app/DownloadsPage.qml:46 src/app/webbrowser/Browser.qml:768
269269
#: src/app/webcontainer/WebappSettingsPage.qml:117
270270
msgid "Downloads"
271271
msgstr "Qulo"
272272

273-
#: src/app/DownloadsPage.qml:58
273+
#: src/app/DownloadsPage.qml:60
274274
msgid "Confirm selection"
275275
msgstr "Meexo diggos"
276276

277-
#: src/app/DownloadsPage.qml:277
277+
#: src/app/DownloadsPage.qml:297
278278
msgid "No downloads available"
279279
msgstr "Quloh tanin matan"
280280

@@ -463,105 +463,115 @@ msgstr "Web aracta %1:%2 asliinok faxxa"
463463
msgid "Save page as HTML / PDF"
464464
msgstr ""
465465

466-
#: src/app/SavePageDialog.qml:35
466+
#: src/app/SavePageDialog.qml:41
467+
#, fuzzy
468+
msgid "No save actions are available"
469+
msgstr "Quloh tanin matan"
470+
471+
#: src/app/SavePageDialog.qml:46
467472
msgid "Save as HTML"
468473
msgstr ""
469474

470-
#: src/app/SavePageDialog.qml:44
475+
#: src/app/SavePageDialog.qml:54
476+
#: src/app/webbrowser/ContentDownloadDialog.qml:102
477+
msgid "Download"
478+
msgstr "Qulo"
479+
480+
#: src/app/SavePageDialog.qml:64
471481
msgid "Save as PDF"
472482
msgstr ""
473483

474-
#: src/app/WebViewImpl.qml:640 src/app/webbrowser/Browser.qml:801
484+
#: src/app/WebViewImpl.qml:667 src/app/webbrowser/Browser.qml:815
475485
msgid "Zoom"
476486
msgstr ""
477487

478-
#: src/app/ZoomControls.qml:36
488+
#: src/app/ZoomControls.qml:62
479489
msgid "Zoom Out"
480490
msgstr ""
481491

482-
#: src/app/ZoomControls.qml:43
492+
#: src/app/ZoomControls.qml:69
483493
msgid "Reset"
484494
msgstr ""
485495

486-
#: src/app/ZoomControls.qml:43
496+
#: src/app/ZoomControls.qml:69
487497
msgid "fit"
488498
msgstr ""
489499

490-
#: src/app/ZoomControls.qml:50
500+
#: src/app/ZoomControls.qml:76
491501
msgid "Zoom In"
492502
msgstr ""
493503

494-
#: src/app/ZoomControls.qml:57 src/app/webbrowser/BookmarkOptions.qml:174
504+
#: src/app/ZoomControls.qml:83 src/app/webbrowser/BookmarkOptions.qml:174
495505
#: src/app/webbrowser/SettingsPage.qml:530
496506
msgid "Save"
497507
msgstr "Taagis"
498508

499-
#: src/app/ZoomControls.qml:97
509+
#: src/app/ZoomControls.qml:101
500510
msgid "Current Zoom"
501511
msgstr ""
502512

503-
#: src/app/ZoomControls.qml:98
513+
#: src/app/ZoomControls.qml:102
504514
msgid "domain"
505515
msgstr ""
506516

507-
#: src/app/ZoomControls.qml:98
517+
#: src/app/ZoomControls.qml:102
508518
#, fuzzy
509519
#| msgid "Default"
510520
msgid "default"
511521
msgstr "Koyni"
512522

513-
#: src/app/ZoomControls.qml:98
523+
#: src/app/ZoomControls.qml:102
514524
msgid "auto-fit"
515525
msgstr ""
516526

517-
#: src/app/ZoomControls.qml:183
527+
#: src/app/ZoomControls.qml:187
518528
#, fuzzy
519529
#| msgid "Save image"
520530
msgid "Save Zoom"
521531
msgstr "muuci taagis"
522532

523-
#: src/app/ZoomControls.qml:184
533+
#: src/app/ZoomControls.qml:188
524534
msgid "none"
525535
msgstr ""
526536

527-
#: src/app/ZoomControls.qml:184
537+
#: src/app/ZoomControls.qml:188
528538
#, qt-format
529539
msgid ""
530540
"domain zoom (currently %1 and can be removed with reset button or from "
531541
"domain specific settings in privacy settings)"
532542
msgstr ""
533543

534-
#: src/app/ZoomControls.qml:185
544+
#: src/app/ZoomControls.qml:189
535545
msgid " and resets domain zoom"
536546
msgstr ""
537547

538-
#: src/app/ZoomControls.qml:185
548+
#: src/app/ZoomControls.qml:189
539549
#, qt-format
540550
msgid "default zoom (currently %1%, can be changed from settings menu%2)"
541551
msgstr ""
542552

543-
#: src/app/ZoomControls.qml:186
553+
#: src/app/ZoomControls.qml:190
544554
msgid "the current web app"
545555
msgstr ""
546556

547-
#: src/app/ZoomControls.qml:186
557+
#: src/app/ZoomControls.qml:190
548558
#, qt-format
549559
msgid "Current zoom (%1%) can be saved for %2 as "
550560
msgstr ""
551561

552-
#: src/app/ZoomControls.qml:188
562+
#: src/app/ZoomControls.qml:192
553563
#, fuzzy
554564
#| msgid "More"
555565
msgid "or"
556566
msgstr "Ossotina"
557567

558-
#: src/app/ZoomControls.qml:194
568+
#: src/app/ZoomControls.qml:198
559569
#, fuzzy
560570
#| msgid "Save in"
561571
msgid "Save for domain"
562572
msgstr "Addat taagis"
563573

564-
#: src/app/ZoomControls.qml:207
574+
#: src/app/ZoomControls.qml:211
565575
msgid "Save as default"
566576
msgstr ""
567577

@@ -599,7 +609,7 @@ msgstr "Aydaadu Saytunis"
599609
msgid "Clear Navigation History"
600610
msgstr "Giti-ceesih Aydaadu Saytunis"
601611

602-
#: src/app/actions/Copy.qml:22 src/app/webbrowser/AddressBar.qml:347
612+
#: src/app/actions/Copy.qml:22 src/app/webbrowser/AddressBar.qml:373
603613
msgid "Copy"
604614
msgstr "Korraaqis"
605615

@@ -611,7 +621,7 @@ msgstr "Muuci korraqis"
611621
msgid "Copy link"
612622
msgstr "Korraq cixu"
613623

614-
#: src/app/actions/Cut.qml:22 src/app/webbrowser/AddressBar.qml:336
624+
#: src/app/actions/Cut.qml:22 src/app/webbrowser/AddressBar.qml:362
615625
msgid "Cut"
616626
msgstr ""
617627

@@ -689,7 +699,7 @@ msgstr ""
689699
msgid "Open video in new tab"
690700
msgstr ""
691701

692-
#: src/app/actions/Paste.qml:22 src/app/webbrowser/AddressBar.qml:358
702+
#: src/app/actions/Paste.qml:22 src/app/webbrowser/AddressBar.qml:384
693703
msgid "Paste"
694704
msgstr "Xakab"
695705

@@ -736,7 +746,7 @@ msgstr "galil gey"
736746
msgid "search or enter an address"
737747
msgstr "Sigma gorris hinnay culus"
738748

739-
#: src/app/webbrowser/AddressBar.qml:369
749+
#: src/app/webbrowser/AddressBar.qml:395
740750
msgid "Paste and Go"
741751
msgstr ""
742752

@@ -841,16 +851,23 @@ msgstr "Massosu"
841851
msgid "View source"
842852
msgstr ""
843853

844-
#: src/app/webbrowser/Browser.qml:788
845-
msgid "Save as HTML / PDF"
854+
#: src/app/webbrowser/Browser.qml:794
855+
msgid "Save / Print to PDF"
846856
msgstr ""
847857

848858
#. TRANSLATORS: %1 refers to the current number of tabs opened
849-
#: src/app/webbrowser/Browser.qml:1000 src/app/webbrowser/Browser.qml:1038
859+
#: src/app/webbrowser/Browser.qml:1014 src/app/webbrowser/Browser.qml:1052
850860
#, qt-format
851861
msgid "(%1)"
852862
msgstr "(%1)"
853863

864+
#: src/app/webbrowser/Browser.qml:1830
865+
#, fuzzy
866+
#| msgid ""
867+
#| "Choose an application to open this file or add it to the downloads folder."
868+
msgid "the file is already in the downloads folder."
869+
msgstr "A kiba faktu abnisso doorit hinnay kalah quloh olit tet osis."
870+
854871
#: src/app/webbrowser/ContentDownloadDialog.qml:83
855872
msgid ""
856873
"Choose an application to open this file or add it to the downloads folder."
@@ -860,10 +877,6 @@ msgstr "A kiba faktu abnisso doorit hinnay kalah quloh olit tet osis."
860877
msgid "Choose an application"
861878
msgstr "Abnisso doorit"
862879

863-
#: src/app/webbrowser/ContentDownloadDialog.qml:102
864-
msgid "Download"
865-
msgstr "Qulo"
866-
867880
#: src/app/webbrowser/ExpandedHistoryView.qml:117
868881
#, qt-format
869882
msgid "%1 page"
@@ -1087,7 +1100,7 @@ msgstr "Duddal yan alaalaqak tawquh dagâ fan uysuttuc"
10871100
msgid "Press ESC To Exit Full Screen"
10881101
msgstr "Duddal yan alaalaqak tawquh ESC xukkut"
10891102

1090-
#: src/app/webbrowser/TabPreview.qml:86
1103+
#: src/app/webbrowser/TabPreview.qml:97
10911104
msgid "Tap to view"
10921105
msgstr "Tablê gidih edde cas"
10931106

@@ -1104,13 +1117,13 @@ msgid "Remove"
11041117
msgstr "Kal"
11051118

11061119
#. TRANSLATORS: %1 refers to the current page’s title
1107-
#: src/app/webbrowser/morph-browser.qml:105
1120+
#: src/app/webbrowser/morph-browser.qml:108
11081121
#: src/app/webcontainer/webapp-container.qml:76
11091122
#, fuzzy, qt-format
11101123
msgid "%1 - Morph Web Browser"
11111124
msgstr "%1 - Ubuntu Web Fokkaaqe"
11121125

1113-
#: src/app/webbrowser/morph-browser.qml:107
1126+
#: src/app/webbrowser/morph-browser.qml:110
11141127
#: src/app/webcontainer/webapp-container.qml:78
11151128
#: po/src/app/webbrowser/morph-browser.desktop.in.in.h:2
11161129
#, fuzzy

0 commit comments

Comments
 (0)