Fix nb_NO translation

Former-commit-id: ad49c12

po/nb_NO.po

@@ -8,20 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.tkashkin.gamehub\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2018-11-21 05:51+0300\n"
-"PO-Revision-Date: 2018-11-20 01:35+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: nb\n"
-=======
 "POT-Creation-Date: 2018-11-20 01:35+0300\n"
 "PO-Revision-Date: 2018-11-20 22:41+0000\n"
 "Last-Translator: Anatoliy Kashkin <tkashkin@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/gamehub/"
 "translations/nb_NO/>\n"
 "Language: nb_NO\n"
->>>>>>> weblate/dev
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -104,7 +96,7 @@ msgstr "Ikke installert"
 #: src/data/GameSource.vala:31
 #, c-format
 msgid "%s games"
-msgstr ""
+msgstr "%s spill"
 
 #: src/data/sources/steam/Steam.vala:43
 msgid "Your SteamID will be read from Steam configuration file"
@@ -618,14 +610,6 @@ msgstr "Listevisning"
 msgid "All games"
 msgstr "Alle spill"
 
-<<<<<<< HEAD
-=======
-#: src/ui/views/GamesView/GamesView.vala:170
-#, c-format
-msgid "%s games"
-msgstr "%s spill"
-
->>>>>>> weblate/dev
 #: src/ui/views/GamesView/GamesView.vala:177
 msgid "Downloads"
 msgstr "Nedlastinger"