X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fresources%2Ffeeds.json;h=b10615ca30619f324c27cff63d3dd35eafd2d020;hb=3b83a1595fc151d27a2074dcc0effa7f120227cd;hp=7ec9e494c98f918a026a856c49ca0dfb861dd6ad;hpb=e93f5e690bea424f7b4aec8640c865ca92006db8;p=pnews.git

diff --git a/war/src/main/resources/feeds.json b/war/src/main/resources/feeds.json
index 7ec9e49..b10615c 100644
--- a/war/src/main/resources/feeds.json
+++ b/war/src/main/resources/feeds.json
@@ -99,6 +99,7 @@
                 "http://feeds.feedburner.com/lesnumeriques/news": { "categories": ["technologie"] },
                 "https://www.nextinpact.com/rss/acces-libre.xml": { "categories": ["technologie"] },
                 "http://www.zdnet.fr/feeds/rss/actualites/": { "categories": ["technologie"] },
+                "http://www.tomshardware.fr/feeds/rss2/all.xml": { "categories": ["technologie"] },
                 "http://www.frandroid.com/feed": { "categories": ["technologie"] },
                 "http://www.silicon.fr/feed": { "categories": ["technologie"] },
                 "http://www.fredzone.org/feed": { "categories": ["technologie"] },
@@ -120,6 +121,8 @@
                 "https://www.theverge.com/rss/index.xml": { "categories": ["en_technologie"]},
                 "https://www.engadget.com/rss.xml": { "categories": ["en_technologie"]},
                 "http://feeds.feedburner.com/TheBoyGeniusReport?format=xml": { "categories": ["en_technologie"]},
+                "http://www.tomshardware.com/feeds/rss2/all.xml": { "categories": ["en_technologie"]},
+                "https://lifehacker.com/rss": { "categories": ["en_technologie"]},
                 "https://www.popsci.com/rss-technology.xml?loc=contentwell&lnk=tech&dom=section-1": { "categories": ["en_technologie"]},
                 "https://gizmodo.com/rss": { "categories": ["en_technologie"]},
                 "http://feeds.feedburner.com/d0od?format=xml": { "categories": ["en_linux"]},
@@ -132,6 +135,8 @@
                 "http://www.linux-magazine.com/rss/feed/lmi_news": { "categories": ["en_linux"]},
                 "http://lxer.com/module/newswire/headlines.rss": { "categories": ["en_linux"]},
                 "https://opensource.com/feed": { "categories": ["en_linux"]},
+                "https://www.infoworld.com/category/linux/index.rss": { "categories": ["en_linux"]},
+                "https://www.infoworld.com/category/open-source-tools/index.rss": { "categories": ["en_linux"]},
                 "https://www.space.com/home/feed/site.xml": { "categories": ["en_space"]},
                 "https://www.nasa.gov/rss/dyn/breaking_news.rss": { "categories": ["en_space"]},
                 "http://www.esa.int/rssfeed/Our_Activities/Space_News": { "categories": ["en_space"]},
@@ -145,7 +150,13 @@
                         "Read More",
                         "Digital Trends",
                         "Joey Sneddon",
-                        "CA"
-                ]
+                        "CA",
+                        "Read"
+                ],
+                "aliases": {
+                        "U.S.": ["United States", "US"],
+                        "U.K.": ["UK", "United Kingdom"],
+                        "AWS": ["Amazon Web Services"]
+                }
         }
 }