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

Commit

Permalink
Merge branch 'xenial_-_combine' into xenial_-_fullscreenhint
Browse files Browse the repository at this point in the history
  • Loading branch information
kugiigi committed May 3, 2021
2 parents 601e037 + 7b65526 commit 290aee3
Show file tree
Hide file tree
Showing 99 changed files with 5,649 additions and 4,188 deletions.
1 change: 1 addition & 0 deletions clickable.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"template": "cmake",
"kill": "morph-browser",
"qt_version": "5.12",
"build_args": "-DCLICK_MODE=ON",
"dependencies_target": [
"qtwebengine5-dev"
Expand Down
101 changes: 57 additions & 44 deletions po/aa.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: morph-browser\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-12-20 13:28+0000\n"
"POT-Creation-Date: 2020-07-18 19:58+0000\n"
"PO-Revision-Date: 2016-02-14 22:31+0000\n"
"Last-Translator: Charif AYFARAH <[email protected]>\n"
"Language-Team: Afar <[email protected]>\n"
Expand Down Expand Up @@ -60,8 +60,8 @@ msgstr "Oggol"
#: src/app/CertificateVerificationDialog.qml:46
#: src/app/ColorSelectDialog.qml:84 src/app/ConfirmDialog.qml:41
#: src/app/DownloadDelegate.qml:159 src/app/HttpAuthenticationDialog.qml:80
#: src/app/PromptDialog.qml:61 src/app/SavePageDialog.qml:52
#: src/app/ZoomControls.qml:225 src/app/webbrowser/BookmarkOptions.qml:164
#: src/app/PromptDialog.qml:61 src/app/SavePageDialog.qml:73
#: src/app/ZoomControls.qml:229 src/app/webbrowser/BookmarkOptions.qml:164
#: src/app/webbrowser/ContentDownloadDialog.qml:114
#: src/app/webbrowser/ContextMenuMobile.qml:143
#: src/app/webbrowser/SettingsPage.qml:438
Expand Down Expand Up @@ -158,13 +158,13 @@ msgid "Custom User Agents"
msgstr ""

#: src/app/CustomUserAgentsPage.qml:57 src/app/DomainPermissionsPage.qml:69
#: src/app/DomainSettingsPage.qml:66 src/app/DownloadsPage.qml:82
#: src/app/DomainSettingsPage.qml:66 src/app/DownloadsPage.qml:85
#: src/app/actions/SelectAll.qml:22
msgid "Select all"
msgstr "Inkig meex"

#: src/app/CustomUserAgentsPage.qml:73 src/app/DomainPermissionsPage.qml:85
#: src/app/DomainSettingsPage.qml:82 src/app/DownloadsPage.qml:98
#: src/app/DomainSettingsPage.qml:82 src/app/DownloadsPage.qml:101
msgid "Delete"
msgstr "Dug"

Expand Down Expand Up @@ -265,16 +265,16 @@ msgstr ""
msgid "Resume"
msgstr "Qagit"

#: src/app/DownloadsPage.qml:44 src/app/webbrowser/Browser.qml:768
#: src/app/DownloadsPage.qml:46 src/app/webbrowser/Browser.qml:768
#: src/app/webcontainer/WebappSettingsPage.qml:117
msgid "Downloads"
msgstr "Qulo"

#: src/app/DownloadsPage.qml:58
#: src/app/DownloadsPage.qml:60
msgid "Confirm selection"
msgstr "Meexo diggos"

#: src/app/DownloadsPage.qml:277
#: src/app/DownloadsPage.qml:297
msgid "No downloads available"
msgstr "Quloh tanin matan"

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

#: src/app/SavePageDialog.qml:35
#: src/app/SavePageDialog.qml:41
#, fuzzy
msgid "No save actions are available"
msgstr "Quloh tanin matan"

#: src/app/SavePageDialog.qml:46
msgid "Save as HTML"
msgstr ""

#: src/app/SavePageDialog.qml:44
#: src/app/SavePageDialog.qml:54
#: src/app/webbrowser/ContentDownloadDialog.qml:102
msgid "Download"
msgstr "Qulo"

#: src/app/SavePageDialog.qml:64
msgid "Save as PDF"
msgstr ""

#: src/app/WebViewImpl.qml:640 src/app/webbrowser/Browser.qml:801
#: src/app/WebViewImpl.qml:667 src/app/webbrowser/Browser.qml:815
msgid "Zoom"
msgstr ""

#: src/app/ZoomControls.qml:36
#: src/app/ZoomControls.qml:62
msgid "Zoom Out"
msgstr ""

#: src/app/ZoomControls.qml:43
#: src/app/ZoomControls.qml:69
msgid "Reset"
msgstr ""

#: src/app/ZoomControls.qml:43
#: src/app/ZoomControls.qml:69
msgid "fit"
msgstr ""

#: src/app/ZoomControls.qml:50
#: src/app/ZoomControls.qml:76
msgid "Zoom In"
msgstr ""

#: src/app/ZoomControls.qml:57 src/app/webbrowser/BookmarkOptions.qml:174
#: src/app/ZoomControls.qml:83 src/app/webbrowser/BookmarkOptions.qml:174
#: src/app/webbrowser/SettingsPage.qml:530
msgid "Save"
msgstr "Taagis"

#: src/app/ZoomControls.qml:97
#: src/app/ZoomControls.qml:101
msgid "Current Zoom"
msgstr ""

#: src/app/ZoomControls.qml:98
#: src/app/ZoomControls.qml:102
msgid "domain"
msgstr ""

#: src/app/ZoomControls.qml:98
#: src/app/ZoomControls.qml:102
#, fuzzy
#| msgid "Default"
msgid "default"
msgstr "Koyni"

#: src/app/ZoomControls.qml:98
#: src/app/ZoomControls.qml:102
msgid "auto-fit"
msgstr ""

#: src/app/ZoomControls.qml:183
#: src/app/ZoomControls.qml:187
#, fuzzy
#| msgid "Save image"
msgid "Save Zoom"
msgstr "muuci taagis"

#: src/app/ZoomControls.qml:184
#: src/app/ZoomControls.qml:188
msgid "none"
msgstr ""

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

#: src/app/ZoomControls.qml:185
#: src/app/ZoomControls.qml:189
msgid " and resets domain zoom"
msgstr ""

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

#: src/app/ZoomControls.qml:186
#: src/app/ZoomControls.qml:190
msgid "the current web app"
msgstr ""

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

#: src/app/ZoomControls.qml:188
#: src/app/ZoomControls.qml:192
#, fuzzy
#| msgid "More"
msgid "or"
msgstr "Ossotina"

#: src/app/ZoomControls.qml:194
#: src/app/ZoomControls.qml:198
#, fuzzy
#| msgid "Save in"
msgid "Save for domain"
msgstr "Addat taagis"

#: src/app/ZoomControls.qml:207
#: src/app/ZoomControls.qml:211
msgid "Save as default"
msgstr ""

Expand Down Expand Up @@ -599,7 +609,7 @@ msgstr "Aydaadu Saytunis"
msgid "Clear Navigation History"
msgstr "Giti-ceesih Aydaadu Saytunis"

#: src/app/actions/Copy.qml:22 src/app/webbrowser/AddressBar.qml:347
#: src/app/actions/Copy.qml:22 src/app/webbrowser/AddressBar.qml:373
msgid "Copy"
msgstr "Korraaqis"

Expand All @@ -611,7 +621,7 @@ msgstr "Muuci korraqis"
msgid "Copy link"
msgstr "Korraq cixu"

#: src/app/actions/Cut.qml:22 src/app/webbrowser/AddressBar.qml:336
#: src/app/actions/Cut.qml:22 src/app/webbrowser/AddressBar.qml:362
msgid "Cut"
msgstr ""

Expand Down Expand Up @@ -689,7 +699,7 @@ msgstr ""
msgid "Open video in new tab"
msgstr ""

#: src/app/actions/Paste.qml:22 src/app/webbrowser/AddressBar.qml:358
#: src/app/actions/Paste.qml:22 src/app/webbrowser/AddressBar.qml:384
msgid "Paste"
msgstr "Xakab"

Expand Down Expand Up @@ -736,7 +746,7 @@ msgstr "galil gey"
msgid "search or enter an address"
msgstr "Sigma gorris hinnay culus"

#: src/app/webbrowser/AddressBar.qml:369
#: src/app/webbrowser/AddressBar.qml:395
msgid "Paste and Go"
msgstr ""

Expand Down Expand Up @@ -841,16 +851,23 @@ msgstr "Massosu"
msgid "View source"
msgstr ""

#: src/app/webbrowser/Browser.qml:788
msgid "Save as HTML / PDF"
#: src/app/webbrowser/Browser.qml:794
msgid "Save / Print to PDF"
msgstr ""

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

#: src/app/webbrowser/Browser.qml:1830
#, fuzzy
#| msgid ""
#| "Choose an application to open this file or add it to the downloads folder."
msgid "the file is already in the downloads folder."
msgstr "A kiba faktu abnisso doorit hinnay kalah quloh olit tet osis."

#: src/app/webbrowser/ContentDownloadDialog.qml:83
msgid ""
"Choose an application to open this file or add it to the downloads folder."
Expand All @@ -860,10 +877,6 @@ msgstr "A kiba faktu abnisso doorit hinnay kalah quloh olit tet osis."
msgid "Choose an application"
msgstr "Abnisso doorit"

#: src/app/webbrowser/ContentDownloadDialog.qml:102
msgid "Download"
msgstr "Qulo"

#: src/app/webbrowser/ExpandedHistoryView.qml:117
#, qt-format
msgid "%1 page"
Expand Down Expand Up @@ -1087,7 +1100,7 @@ msgstr "Duddal yan alaalaqak tawquh dagâ fan uysuttuc"
msgid "Press ESC To Exit Full Screen"
msgstr "Duddal yan alaalaqak tawquh ESC xukkut"

#: src/app/webbrowser/TabPreview.qml:86
#: src/app/webbrowser/TabPreview.qml:97
msgid "Tap to view"
msgstr "Tablê gidih edde cas"

Expand All @@ -1104,13 +1117,13 @@ msgid "Remove"
msgstr "Kal"

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

#: src/app/webbrowser/morph-browser.qml:107
#: src/app/webbrowser/morph-browser.qml:110
#: src/app/webcontainer/webapp-container.qml:78
#: po/src/app/webbrowser/morph-browser.desktop.in.in.h:2
#, fuzzy
Expand Down
Loading

0 comments on commit 290aee3

Please sign in to comment.