Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev

languages/ja.json

@@ -1283,6 +1283,7 @@
 	"Presets": "プリセット",
 	"Preview": "Preview",
 	"Previous Video": "Previous Video",
+	"Primary":"プライマリ",
 	"Primary Engine": "Primary Engine",
 	"Primary Input": "プライマリインプット",
 	"privateKey": "Private Key",
@@ -1405,6 +1406,7 @@
 	"Search Object Tags": "オブジェクトを探す",
 	"Search Settings": "ビデオを検索",
 	"Search": "検索",
+	"Second": "セカンド",  
 	"Second stream in feed": "フィードの二番目のストリーム",
 	"Secure": "セキュア",
 	"Select a Monitor": "Select a Monitor",