Merge branch 'master' into feature/support-hashed-url

This just resolves conflicting changes to package-lock.json, which would
otherwise make merging the PR tricky.

README.md

@@ -30,7 +30,7 @@ More information on websites: [wallabag.org](https://wallabag.org) and [github.c
 
 ## Configuration
 
-<https://wallabag.org/en/news/wallabagger-howto>
+<https://wallabag.org/news/wallabagger-howto/>
 
 ## Acknowledgement
 

package.json

@@ -43,7 +43,7 @@
     "eslint": "^7.32.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-plugin-compat": "^4.2.0",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-standard": "^5.0.0",

wallabagger/_locales/ar/messages.json

@@ -1 +1,6 @@
-{}
+{
+    "Settings": {
+        "message": "اﻹعدادات",
+        "description": "Options"
+    }
+}

wallabagger/_locales/nb_NO/messages.json

@@ -154,5 +154,165 @@
     "Token_expires_in": {
         "message": "Symbol utløper om",
         "description": "Options"
+    },
+    "Enter_your_tags_here": {
+        "message": "Legg til dine stikkord her",
+        "description": "Popup"
+    },
+    "Wallabag_it_description": {
+        "message": "Lagre siden i Wallabag uten å åpne popup-vinduet",
+        "description": "Manifest.json"
+    },
+    "Unset_this_article_as_archived_into_Wallabag": {
+        "message": "Slå av arkivstatus for denne artikkelen i wallabag",
+        "description": "Popup"
+    },
+    "Saving_tags": {
+        "message": "Lagrer stikkord…",
+        "description": "Popup"
+    },
+    "Go_to_this_article_page": {
+        "message": "Gå til denne artikkelen",
+        "description": "Popup"
+    },
+    "Archive_by_default_when_saving_page": {
+        "message": "Arkiver som standard når du lagrer siden",
+        "description": "Options"
+    },
+    "Due_to_security_reason_we_allow_this_option_only_for_HTTPS_protocol": {
+        "message": "Av sikkerhetshensyn tillater vi dette alternativet bare for HTTPS protokollen",
+        "description": "Options"
+    },
+    "Wallabag_URL": {
+        "message": "wallabag-URL",
+        "description": "Options"
+    },
+    "Agreed": {
+        "message": "Akseptert",
+        "description": "Options"
+    },
+    "Extension_description": {
+        "message": "Denne wallabag v2-utvidelse har muligheten til å redigere tittel og stikkord, angi stjernemerke, og sette tilstand til arkivert eller slettet.",
+        "description": "Manifest.json"
+    },
+    "No_leave_it": {
+        "message": "Nei, la det vær",
+        "description": "Popup"
+    },
+    "Wallabag_permission_checked": {
+        "message": "wallabag-tillatelse sjekket",
+        "description": "Options"
+    },
+    "Tags": {
+        "message": "Stikkord",
+        "description": "background"
+    },
+    "Save_Error": {
+        "message": "Det oppsto en feil ved lagring av artikkelen",
+        "description": "Background"
+    },
+    "Enable_this_only_if_developers_told_you_to": {
+        "message": "Aktiver denne bare dersom en utvikler har bedt deg",
+        "description": "Options"
+    },
+    "Allow_Space_in_tags_this_disables_Space_as_send_tags_key_use_Enter_key_instead": {
+        "message": "Tillat mellomrom i stikkord (dette deaktiverer mellomromstasten som send-stikkord-tast, bruk ny linje-tasten i stedet)",
+        "description": "Options"
+    },
+    "Archive": {
+        "message": "Arkiv",
+        "description": "background"
+    },
+    "Wallabag_URL_checked": {
+        "message": "wallabag-URL sjekket",
+        "description": "Options"
+    },
+    "Tag_already_exists": {
+        "message": "Stikkord finnes allerede",
+        "description": "Popup"
+    },
+    "Not_checked": {
+        "message": "Ikke valgt",
+        "description": "Options"
+    },
+    "Fetch_by_default_when_saving_page": {
+        "message": "Hent innhold fra nettleseren som standard når du lagrer siden",
+        "description": "Options"
+    },
+    "Options_not_defined": {
+        "message": "Wallabagger ikke konfigurert",
+        "description": "Background"
+    },
+    "Wallabag_API_version": {
+        "message": "wallabag-API versjon",
+        "description": "Options"
+    },
+    "Expired": {
+        "message": "Utløpt",
+        "description": "Options"
+    },
+    "Do_you_want_to_remove_this_article_permanently_from_wallabag": {
+        "message": "Øsnker du permanent å slette denne artikkelen fra wallabag?",
+        "description": "Popup"
+    },
+    "Auto_add_single_tag": {
+        "message": "Automatisk legg til stikkord",
+        "description": "Options"
+    },
+    "Others": {
+        "message": "Andre",
+        "description": "Options"
+    },
+    "Fetch_from_the_browser": {
+        "message": "Henter innhold fra nettleseren",
+        "description": "Options"
+    },
+    "Yes_delete_it": {
+        "message": "Ja, slett det",
+        "description": "Popup"
+    },
+    "Edit_the_Wallabag_title_of_this_article": {
+        "message": "Rediger wallabag sin tittel for denne artikkelen",
+        "description": "Popup"
+    },
+    "Get_token": {
+        "message": "Hent symbol",
+        "description": "Options"
+    },
+    "Go_to_Wallabag_s_article_page": {
+        "message": "Gå til wallabag sin artikkel",
+        "description": "Popup"
+    },
+    "Wallabag_it": {
+        "message": "wallabag det!",
+        "description": "background"
+    },
+    "Indicate_if_page_already_saved_this_sends_URL_of_each_tab_to_wallabag_use_HTTPS_protocol_for_better_security": {
+        "message": "Angi om siden allerede er lagret (dette sender URL-en til hver fane til wallabag, bruk HTTPS-protokollen for bedre sikkerhet!)",
+        "description": "Options"
+    },
+    "You_can_find_your_credentials_here": {
+        "message": "Du finner dine akkreditiver her:",
+        "description": "Options"
+    },
+    "Sites_locally": {
+        "message": "Hent innhold fra nettleseren for angitte nettsteder (én URL pr. linje)",
+        "description": "Options"
+    },
+    "Tags_found": {
+        "message": "Stikkord funnet:",
+        "description": "Popup"
+    },
+    "Unset_this_article_as_starred_into_Wallabag": {
+        "message": "Slå av stjernemerke-status for denne artikkelen i wallabag",
+        "description": "Popup"
+    },
+    "Wallabag_API_token": {
+        "message": "wallabag-API symbol",
+        "description": "Options"
+    },
+    "We_need_an_access_to_your_wallabag_instance_to_read_write_and_update_content_Please_test_the_URL_again_and_accept_the_permission_request": {
+        "message": "Vi trenger tilgang til wallabag-instansen din for å lese, skrive og oppdatere innhold. Vennligst test URL-en på nytt og godta forespørselen.",
+        "description": "Options"
     }
 }

wallabagger/_locales/zh/messages.json

@@ -294,5 +294,25 @@
     "Sites_locally": {
         "message": "从浏览器获取内容（每行一条 URL)",
         "description": "Options"
+    },
+    "Settings": {
+        "message": "设置",
+        "description": "Options"
+    },
+    "Fetch_by_default_when_saving_page": {
+        "message": "保存页面时默认从浏览器读取内容",
+        "description": "Options"
+    },
+    "Options": {
+        "message": "选项",
+        "description": "Options"
+    },
+    "Others": {
+        "message": "其他",
+        "description": "Options"
+    },
+    "Fetch_from_the_browser": {
+        "message": "从浏览器中提取的内容",
+        "description": "Options"
     }
 }

wallabagger/_locales/zh_Hant/messages.json

@@ -8,7 +8,7 @@
         "description": "background"
     },
     "Starred": {
-        "message": "已加星標",
+        "message": "已收藏",
         "description": "background"
     },
     "Agreed": {
@@ -20,7 +20,7 @@
         "description": "background"
     },
     "All_entries": {
-        "message": "全部文章",
+        "message": "所有項目",
         "description": "background"
     },
     "Allow_Space_in_tags_this_disables_Space_as_send_tags_key_use_Enter_key_instead": {
@@ -30,5 +30,125 @@
     "Article_s_link": {
         "message": "文章連結",
         "description": "Popup"
+    },
+    "Tags": {
+        "message": "標籤",
+        "description": "background"
+    },
+    "Settings": {
+        "message": "設定",
+        "description": "Options"
+    },
+    "hour_many": {
+        "message": "小時",
+        "description": "Options"
+    },
+    "hour_one": {
+        "message": "小時",
+        "description": "Options"
+    },
+    "minute_many": {
+        "message": "分鐘",
+        "description": "Options"
+    },
+    "minute_one": {
+        "message": "分鐘",
+        "description": "Options"
+    },
+    "Save": {
+        "message": "儲存",
+        "description": "Popup"
+    },
+    "Others": {
+        "message": "其他",
+        "description": "Options"
+    },
+    "Tag_already_exists": {
+        "message": "已有此標籤",
+        "description": "Popup"
+    },
+    "Wallabag_URL": {
+        "message": "wallabag 網址",
+        "description": "Options"
+    },
+    "Client_ID": {
+        "message": "用戶端 ID",
+        "description": "Options"
+    },
+    "Article_s_title": {
+        "message": "文章標題",
+        "description": "Popup"
+    },
+    "Delete_this_article": {
+        "message": "刪除此文章",
+        "description": "Popup"
+    },
+    "Do_you_want_to_remove_this_article_permanently_from_wallabag": {
+        "message": "你想自 wallabag 永久地移除此文章嗎？",
+        "description": "Popup"
+    },
+    "Edit_the_Wallabag_title_of_this_article": {
+        "message": "編輯此文章於 wallabag 的標題",
+        "description": "Popup"
+    },
+    "Go_to_Wallabag_s_article_page": {
+        "message": "往 wallabag 的文章頁面",
+        "description": "Popup"
+    },
+    "Go_to_this_article_page": {
+        "message": "往此文章頁面",
+        "description": "Popup"
+    },
+    "Remove_this_article_from_Wallabag": {
+        "message": "自 wallabag 移除此文章",
+        "description": "Popup"
+    },
+    "Wallabag_API_version": {
+        "message": "wallabag API 版本",
+        "description": "Options"
+    },
+    "State": {
+        "message": "狀態",
+        "description": "Options"
+    },
+    "User_login": {
+        "message": "使用者登入",
+        "description": "Options"
+    },
+    "User_password": {
+        "message": "使用者密碼",
+        "description": "Options"
+    },
+    "Client_secret": {
+        "message": "用戶端密碼",
+        "description": "Options"
+    },
+    "Token_expires_in": {
+        "message": "token 有效期至",
+        "description": "Options"
+    },
+    "Get_token": {
+        "message": "取得 token",
+        "description": "Options"
+    },
+    "Wallabag_API_token": {
+        "message": "wallabag API token",
+        "description": "Options"
+    },
+    "Options": {
+        "message": "選項",
+        "description": "Options"
+    },
+    "Options_not_defined": {
+        "message": "尚未設置 Wallabagger",
+        "description": "Background"
+    },
+    "Use_HTTPS": {
+        "message": "使用 HTTPS 安全協定",
+        "description": "Options"
+    },
+    "Wallabag_it": {
+        "message": "wallabag 它！",
+        "description": "background"
     }
 }