Fixed conflicts

2022-07-24 11:37:28 +03:00 · 2022-07-24 11:37:28 +03:00 · 4b47590c3a
parent ccfcccd53e 468f9ff12c
commit 4b47590c3a
11 changed files with 497 additions and 7 deletions
--- a/README.md
+++ b/README.md
@ -2,9 +2,9 @@

 A web extension that redirects YouTube, Twitter, Instagram... requests to alternative privacy friendly frontends and backends.

-[![Matrix Badge](https://img.shields.io/matrix/libredirect:matrix.org?label=matrix%20chat)](https://matrix.to/#/#libredirect:tokhmi.xyz)
+[![Matrix Badge](https://img.shields.io/matrix/libredirect:matrix.org?label=matrix%20chat)](https://matrix.to/#/#libredirect-space:matrix.org)
 [![Firefox users Badge](https://img.shields.io/amo/users/libredirect?label=Firefox%20users)](https://addons.mozilla.org/firefox/addon/libredirect/)
-[![Matrix Badge](https://img.shields.io/liberapay/gives/libredirect?label=Liberapay)](https://liberapay.com/LibRedirect)
+[![LibrePay Badge](https://img.shields.io/liberapay/gives/libredirect?label=Liberapay)](https://liberapay.com/LibRedirect)

 [![Firefox Add-on](./img/badge-amo.png)](https://addons.mozilla.org/firefox/addon/libredirect/)&nbsp;
 <a href="https://microsoftedge.microsoft.com/addons/detail/libredirect/aodffkeankebfonljgbcfbbaljopcpdb">
--- a/src/_locales/de/messages.json
+++ b/src/_locales/de/messages.json
@ -96,7 +96,7 @@
        "description": "used in the settings page"
    },
    "autoRedirect": {
-        "message": "Automatisch Instanzen meiden, die offline sind",
+        "message": "Automatisch von Offline-Instanzen zu Online-Instanzen wechseln",
        "description": "used in the settings page"
    },
    "exceptions": {
--- a/src/_locales/es/messages.json
+++ b/src/_locales/es/messages.json
@ -0,0 +1,215 @@
+{
+    "extensionName": {
+        "message": "LibRedirect",
+        "description": "name of the extension"
+    },
+    "switchInstance": {
+        "message": "Cambiar instancia",
+        "description": "used in manifest.json as shortcut description"
+    },
+    "settings": {
+        "message": "Ajustes",
+        "description": "used in the popup"
+    },
+    "general": {
+        "message": "General",
+        "description": "used in the settings page"
+    },
+    "translate": {
+        "message": "Traductor",
+        "description": "used in the settings page"
+    },
+    "search": {
+        "message": "Búsqueda",
+        "description": "used in the settings page"
+    },
+    "ytmusic": {
+        "message": "YT Music",
+        "description": "used in the settings page"
+    },
+    "wikipedia": {
+        "message": "Wikipedia",
+        "description": "used in the settings page"
+    },
+    "medium": {
+        "message": "Medium",
+        "description": "used in the settings page"
+    },
+    "tor": {
+        "message": "Tor",
+        "description": "used in the settings page"
+    },
+    "theme": {
+        "message": "Tema",
+        "description": "used in the settings page"
+    },
+    "light": {
+        "message": "Claro",
+        "description": "used in the settings page"
+    },
+    "autoRedirect": {
+        "message": "Redirigir automáticamente las instancias offline a las online",
+        "description": "used in the settings page"
+    },
+    "exceptions": {
+        "message": "Excepciones",
+        "description": "used in the settings page"
+    },
+    "importSettings": {
+        "message": "Importar Ajustes",
+        "description": "used in the settings page"
+    },
+    "exportSettings": {
+        "message": "Exportar Ajustes",
+        "description": "used in the settings page"
+    },
+    "customPopup": {
+        "message": "Personalizar Ventana Emergente",
+        "description": "used in the settings page"
+    },
+    "enable": {
+        "message": "Activar",
+        "description": "used in the settings page"
+    },
+    "protocol": {
+        "message": "Protocolo",
+        "description": "used in the settings page"
+    },
+    "normal": {
+        "message": "Normal",
+        "description": "used in the settings page"
+    },
+    "frontend": {
+        "message": "Frontend",
+        "description": "used in the settings page"
+    },
+    "embeddedVids": {
+        "message": "Frontend para Videos Incrustados",
+        "description": "used in the settings page"
+    },
+    "onlyEmbedded": {
+        "message": "solo incrustados",
+        "description": "used in the settings page"
+    },
+    "copyRaw": {
+        "message": "Copiar Original"
+    },
+    "copied": {
+        "message": "Copiado"
+    },
+    "unifySettings": {
+        "message": "Unificar Ajustes"
+    },
+    "lbry": {
+        "message": "LBRY"
+    },
+    "i2p": {
+        "message": "I2P"
+    },
+    "instanceOffline": {
+        "message": "Esta instancia está offline, serás redirigido/a luego de&nbsp;",
+        "description": "used in instance_offline.html"
+    },
+    "testInstancesLatency": {
+        "message": "Probar Latencia de las Instancias"
+    },
+    "youtube": {
+        "message": "YouTube",
+        "description": "used in the settings page"
+    },
+    "extensionDescription": {
+        "message": "Una extensión web que redirige sitios populares a frontends y backends alternativos que respetan la privacidad",
+        "description": "description of the extension"
+    },
+    "maps": {
+        "message": "Mapas",
+        "description": "used in the settings page"
+    },
+    "sendFiles": {
+        "message": "Enviar Archivos",
+        "description": "used in the settings page"
+    },
+    "twitter": {
+        "message": "Twitter",
+        "description": "used in the settings page"
+    },
+    "reddit": {
+        "message": "Reddit",
+        "description": "used in the settings page"
+    },
+    "instagram": {
+        "message": "Instagram",
+        "description": "used in the settings page"
+    },
+    "tiktok": {
+        "message": "TikTok",
+        "description": "used in the settings page"
+    },
+    "imgur": {
+        "message": "Imgur",
+        "description": "used in the settings page"
+    },
+    "resetSettings": {
+        "message": "Restablecer Ajustes",
+        "description": "used in the settings page"
+    },
+    "updateInstances": {
+        "message": "Actualizar Instancias",
+        "description": "used in the settings page"
+    },
+    "defaultInstances": {
+        "message": "Instancias Predeterminadas",
+        "description": "used in the settings page"
+    },
+    "peertube": {
+        "message": "PeerTube",
+        "description": "used in the settings page"
+    },
+    "system": {
+        "message": "Sistema",
+        "description": "used in the settings page"
+    },
+    "dark": {
+        "message": "Oscuro",
+        "description": "used in the settings page"
+    },
+    "customInstances": {
+        "message": "Instancias Personalizadas",
+        "description": "used in the settings page"
+    },
+    "notFullyPrivate": {
+        "message": "Este no es un frontend completamente privado."
+    },
+    "toggleAll": {
+        "message": "Alternar todo",
+        "description": "used in the settings page"
+    },
+    "onlyNotEmbedded": {
+        "message": "solo los no incrustados",
+        "description": "used in the settings page"
+    },
+    "instanceIsOff": {
+        "message": "La instancia está offline",
+        "description": "used in instance_offline.html"
+    },
+    "searchNote": {
+        "message": "Nota: Utilice la búsqueda en todo su potencial haciendo de LibRedirect su motor de búsqueda predeterminado.",
+        "description": "used in the settings page"
+    },
+    "redirectType": {
+        "message": "Tipo de Redirección",
+        "description": "used in the settings page"
+    },
+    "both": {
+        "message": "ambos",
+        "description": "used in the settings page"
+    },
+    "cancel": {
+        "message": "Cancelar",
+        "description": "used in instance_offline.html"
+    },
+    "redirectionCanceled": {
+        "message": "Redirección cancelada",
+        "description": "used in instance_offline.js"
+    }
+}
--- a/src/_locales/gl/messages.json
+++ b/src/_locales/gl/messages.json
@ -208,5 +208,11 @@
    },
    "i2p": {
        "message": "I2P"
+    },
+    "unifySettings": {
+        "message": "Unificar Axustes"
+    },
+    "loki": {
+        "message": "Lokinet"
    }
 }
--- a/src/_locales/ko/messages.json
+++ b/src/_locales/ko/messages.json
@ -0,0 +1,199 @@
+{
+    "extensionName": {
+        "message": "LibRedirect",
+        "description": "name of the extension"
+    },
+    "switchInstance": {
+        "message": "인스턴스 바꾸기",
+        "description": "used in manifest.json as shortcut description"
+    },
+    "settings": {
+        "message": "설정",
+        "description": "used in the popup"
+    },
+    "general": {
+        "message": "일반",
+        "description": "used in the settings page"
+    },
+    "search": {
+        "message": "검색",
+        "description": "used in the settings page"
+    },
+    "translate": {
+        "message": "번역",
+        "description": "used in the settings page"
+    },
+    "ytmusic": {
+        "message": "YT Music",
+        "description": "used in the settings page"
+    },
+    "imgur": {
+        "message": "Imgur",
+        "description": "used in the settings page"
+    },
+    "wikipedia": {
+        "message": "Wikipedia",
+        "description": "used in the settings page"
+    },
+    "peertube": {
+        "message": "PeerTube",
+        "description": "used in the settings page"
+    },
+    "medium": {
+        "message": "Medium",
+        "description": "used in the settings page"
+    },
+    "tor": {
+        "message": "Tor",
+        "description": "used in the settings page"
+    },
+    "theme": {
+        "message": "테마",
+        "description": "used in the settings page"
+    },
+    "system": {
+        "message": "시스템",
+        "description": "used in the settings page"
+    },
+    "light": {
+        "message": "밝음",
+        "description": "used in the settings page"
+    },
+    "updateInstances": {
+        "message": "인스터스 업데이트",
+        "description": "used in the settings page"
+    },
+    "importSettings": {
+        "message": "설정 불러오기",
+        "description": "used in the settings page"
+    },
+    "exportSettings": {
+        "message": "설정 내보내기",
+        "description": "used in the settings page"
+    },
+    "enable": {
+        "message": "활성화",
+        "description": "used in the settings page"
+    },
+    "protocol": {
+        "message": "프로토콜",
+        "description": "used in the settings page"
+    },
+    "normal": {
+        "message": "일반",
+        "description": "used in the settings page"
+    },
+    "defaultInstances": {
+        "message": "기본 인스턴스",
+        "description": "used in the settings page"
+    },
+    "customInstances": {
+        "message": "사용자 인스턴스",
+        "description": "used in the settings page"
+    },
+    "frontend": {
+        "message": "프론트엔드",
+        "description": "used in the settings page"
+    },
+    "youtube": {
+        "message": "YouTube",
+        "description": "used in the settings page"
+    },
+    "testInstancesLatency": {
+        "message": "인스턴스 지연 시간 시험"
+    },
+    "redirectType": {
+        "message": "리다이렉트 종류",
+        "description": "used in the settings page"
+    },
+    "onlyEmbedded": {
+        "message": "임베디드 된 것만",
+        "description": "used in the settings page"
+    },
+    "onlyNotEmbedded": {
+        "message": "임베디드 안된 것만",
+        "description": "used in the settings page"
+    },
+    "instanceOffline": {
+        "message": "이 인스턴스는 오프라인입니다, 다음 초 후에 리다이렉트됩니다:&nbsp;",
+        "description": "used in instance_offline.html"
+    },
+    "notFullyPrivate": {
+        "message": "완전한 개인 프론트엔드가 아닙니다."
+    },
+    "searchNote": {
+        "message": "안내: LibRedirect를 기본 검색 엔진으로 만들면 완벽히 사용할 수 있습니다.",
+        "description": "used in the settings page"
+    },
+    "both": {
+        "message": "둘 다",
+        "description": "used in the settings page"
+    },
+    "embeddedVids": {
+        "message": "임베디드된 동영상 프론트엔드",
+        "description": "used in the settings page"
+    },
+    "unifySettings": {
+        "message": "설정 통일하기"
+    },
+    "maps": {
+        "message": "지도",
+        "description": "used in the settings page"
+    },
+    "sendFiles": {
+        "message": "파일 전송",
+        "description": "used in the settings page"
+    },
+    "instagram": {
+        "message": "Instagram",
+        "description": "used in the settings page"
+    },
+    "exceptions": {
+        "message": "예외",
+        "description": "used in the settings page"
+    },
+    "resetSettings": {
+        "message": "설정 초기화",
+        "description": "used in the settings page"
+    },
+    "customPopup": {
+        "message": "팝업 사용자 설정",
+        "description": "used in the settings page"
+    },
+    "dark": {
+        "message": "어두움",
+        "description": "used in the settings page"
+    },
+    "autoRedirect": {
+        "message": "오프라인 인스터스를 온라인으로 자동 리다이렉트",
+        "description": "used in the settings page"
+    },
+    "toggleAll": {
+        "message": "전체 전환",
+        "description": "used in the settings page"
+    },
+    "instanceIsOff": {
+        "message": "인스턴스 오프라인",
+        "description": "used in instance_offline.html"
+    },
+    "lbry": {
+        "message": "LBRY"
+    },
+    "i2p": {
+        "message": "I2P"
+    },
+    "cancel": {
+        "message": "취소",
+        "description": "used in instance_offline.html"
+    },
+    "redirectionCanceled": {
+        "message": "리다이렉션 취소됨",
+        "description": "used in instance_offline.js"
+    },
+    "copyRaw": {
+        "message": "Raw 복사"
+    },
+    "copied": {
+        "message": "복사됨"
+    }
+}
--- a/src/_locales/pl/messages.json
+++ b/src/_locales/pl/messages.json
@ -211,5 +211,8 @@
    "customPopup": {
        "message": "Dostosuj Wyskakujące Okienko",
        "description": "used in the settings page"
+    },
+    "loki": {
+        "message": "Lokinet"
    }
 }
--- a/src/_locales/ru/messages.json
+++ b/src/_locales/ru/messages.json
@ -0,0 +1 @@
+{}
--- a/src/_locales/tr/messages.json
+++ b/src/_locales/tr/messages.json
@ -211,5 +211,8 @@
    "normal": {
        "message": "Normal",
        "description": "used in the settings page"
+    },
+    "loki": {
+        "message": "Lokinet"
    }
 }
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@ -8,6 +8,11 @@
    "https://piped.mha.fi",
    "https://piped.shimul.me",
    "https://pipedus.palash.dev",
+<<<<<<< HEAD
+=======
+    "https://piped.waffle.wiki",
+    "https://watch.whatever.social",
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
    "https://nitter.domain.glass",
    "https://birdsite.xanny.family",
    "https://nitter.moomoo.me",
@ -18,7 +23,10 @@
    "https://twitter.dr460nf1r3.org",
    "https://nitter.garudalinux.org",
    "https://nitter.wef.lol",
+<<<<<<< HEAD
    "https://nitter.catalyst.sx",
+=======
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
    "https://nitter.fprivacy.com",
    "https://bib.actionsack.com",
    "https://libreddit.domain.glass",
--- a/src/instances/data.json
+++ b/src/instances/data.json
@ -46,10 +46,16 @@
      "https://piped.mha.fi",
      "https://piped.shimul.me",
      "https://pipedus.palash.dev",
+<<<<<<< HEAD
+=======
+      "https://piped.waffle.wiki",
+      "https://watch.whatever.social",
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
      "https://yt.jae.fi",
      "https://piped.mint.lgbt",
      "https://piped.privacy.com.de",
-      "https://piped.esmailelbob.xyz"
+      "https://piped.esmailelbob.xyz",
+      "https://piped.projectsegfau.lt/"
    ],
    "tor": [
      "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
@ -167,6 +173,7 @@
      "https://nitter.projectsegfau.lt",
      "https://singapore.unofficialbird.com",
      "https://twt.funami.tech",
+<<<<<<< HEAD
      "https://nitter.fprivacy.com",
      "https://canada.unofficialbird.com",
      "https://india.unofficialbird.com",
@ -174,6 +181,9 @@
      "https://uk.unofficialbird.com",
      "https://n.l5.ca",
      "https://nitter.slipfox.xyz"
+=======
+      "https://nitter.fprivacy.com"
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
    ],
    "tor": [
      "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
@ -453,6 +463,20 @@
    "loki": []
  },
  "searx": {
+<<<<<<< HEAD
+=======
+    "tor": [
+      "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
+      "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
+      "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
+      "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
+    ],
+    "i2p": [
+      "http://ransack.i2p",
+      "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p"
+    ],
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
    "normal": [
      "https://anon.sx",
      "https://dynabyte.ca",
@ -482,6 +506,7 @@
      "https://searx.tuxcloud.net",
      "https://searx.tyil.nl",
      "https://searx.vanwa.tech",
+      "https://searx.vimproved.me",
      "https://searx.webheberg.info",
      "https://searx.xyz",
      "https://searx.zapashcanon.fr",
@ -495,12 +520,27 @@
      "https://searx.roflcopter.fr"
    ],
    "tor": [
+<<<<<<< HEAD
      "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
      "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
      "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
      "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
+=======
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
+      "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
+      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
+      "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
+      "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
+      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
+      "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
+      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
+      "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
+      "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
    ],
    "i2p": [
      "http://ransack.i2p",
@ -540,7 +580,10 @@
      "https://search.sapti.me",
      "https://search.teamriverbubbles.com",
      "https://search.unlocked.link",
+<<<<<<< HEAD
      "https://search.vidhukant.xyz",
+=======
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
      "https://search.zzls.xyz",
      "https://searx.be",
      "https://searx.becomesovran.com",
@ -563,7 +606,6 @@
      "https://searx.sev.monster",
      "https://searx.slipfox.xyz/searx",
      "https://searx.tiekoetter.com",
-      "https://searx.vimproved.me",
      "https://searx.youshitsune.me",
      "https://searx.zcyph.cc",
      "https://searxng.au/searx",
@ -647,6 +689,7 @@
      "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
      "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
      "http://rimgo.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
+<<<<<<< HEAD
    ],
    "i2p": [],
    "loki": []
@ -659,6 +702,8 @@
      "https://lbry.mutahar.rocks",
      "https://librarian.esmailelbob.xyz",
      "https://lbry.vern.cc"
+=======
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
    ],
    "tor": [
      "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
@ -668,6 +713,7 @@
    "loki": []
  },
  "peertube": [
+<<<<<<< HEAD
    "https://pire.artisanlogiciel.net",
    "https://trutube.xyz",
    "https://tube-test.apps.education.fr",
@ -763,6 +809,8 @@
    "https://peertube.otakufarms.com",
    "https://tube.motuhake.xyz",
    "https://pt.m0r016.net",
+=======
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
    "https://hitchtube.fr",
    "https://video.fox-romka.ru",
    "https://peertube.ctrl-c.liu.se",
@ -933,6 +981,10 @@
    "https://tube.globalfrens.com",
    "https://peertube.hacknews.pmdcollab.org",
    "https://freetubes.nohost.me",
+<<<<<<< HEAD
+=======
+    "https://video.simplex-software.ru",
+>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
    "https://video.snug.moe",
    "https://video.avant-le-strike.buzz",
    "https://videos.ritimo.org",
--- a/src/instances/piped.json
+++ b/src/instances/piped.json
@ -7,11 +7,14 @@
    "https://piped.syncpundit.com",
    "https://piped.mha.fi",
    "https://piped.shimul.me",
-    "https://pipedus.palash.dev/",
+    "https://pipedus.palash.dev",
+    "https://piped.waffle.wiki",
+    "https://watch.whatever.social",
    "https://yt.jae.fi",
    "https://piped.mint.lgbt",
    "https://piped.privacy.com.de",
-    "https://piped.esmailelbob.xyz"
+    "https://piped.esmailelbob.xyz",
+    "https://piped.projectsegfau.lt/"
  ],
  "tor": [
    "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"