Merge branch 'master' of github.com:simplesamlphp/simplesamlphp

modules/discopower/dictionaries/tabs.definition.json

@@ -23,6 +23,9 @@
 	"greece": {
 		"en": "Greece"
 	},
+	"southafrica": {
+		"en": "South Africa"
+	},
 	"edugain": {
 		"en": "Europe (eduGAIN)"
 	},

modules/discopower/dictionaries/tabs.translation.json

@@ -78,6 +78,18 @@
 		"af": "Griekeland",
 		"el": "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1"
 	},
+	"southafrica": {
+		"es": "Sud\u00e1frica",
+		"ru": "\u042e\u0436\u043d\u0430\u044f \u0410\u0444\u0440\u0438\u043a\u0430",
+		"zh-tw": "\u5357\u975e",
+		"nl": "Zuid-Afrika",
+		"gl": "Sur\u00e1frica",
+		"da": "Sydafrika",
+		"af": "Suid-Afrika",
+		"el": "\u039d\u03cc\u03c4\u03b9\u03b1 \u0391\u03c6\u03c1\u03b9\u03ba\u03ae",
+		"xh": "uMzantsi Afrika",
+		"zu": "iNingizimu Afrika"
+	},
 	"edugain": {
 		"es": "Europa (eduGAIN)",
 		"ru": "\u0415\u0432\u0440\u043e\u043f\u0430 (eduGAIN)",

modules/discopower/lib/PowerIdPDisco.php

@@ -259,6 +259,7 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco
             'edugain' => $t->noop('{discopower:tabs:edugain}'),
             'finland' => $t->noop('{discopower:tabs:finland}'),
             'greece' => $t->noop('{discopower:tabs:greece}'),
+            'southafrica' => $t->noop('{discopower:tabs:southafrica}'),
             'iceland' => $t->noop('{discopower:tabs:iceland}'),
             'incommon' => $t->noop('{discopower:tabs:incommon}'),
             'kalmar' => $t->noop('{discopower:tabs:kalmar}'),

modules/discopower/locales/af/LC_MESSAGES/discopower.po

@@ -24,6 +24,9 @@ msgstr "Switserland"
 msgid "{discopower:tabs:greece}"
 msgstr "Griekeland"
 
+msgid "{discopower:tabs:southafrica}"
+msgstr "Suid-Afrika"
+
 msgid "{discopower:tabs:kalmar}"
 msgstr "Kalmar"
 
@@ -75,6 +78,9 @@ msgstr "Noorweë"
 msgid "Greece"
 msgstr "Griekeland"
 
+msgid "South Africa"
+msgstr "Suid-Afrika"
+
 msgid "Miscellaneous"
 msgstr "Verskeie"
 

modules/discopower/locales/da/LC_MESSAGES/discopower.po

@@ -24,6 +24,9 @@ msgstr "Schweiz"
 msgid "{discopower:tabs:greece}"
 msgstr "Grækenland"
 
+msgid "{discopower:tabs:southafrica}"
+msgstr "Sydafrika"
+
 msgid "{discopower:tabs:kalmar}"
 msgstr "Kalmar"
 
@@ -75,6 +78,9 @@ msgstr "Norge"
 msgid "Greece"
 msgstr "Grækenland"
 
+msgid "South Africa"
+msgstr "Sydafrika"
+
 msgid "Miscellaneous"
 msgstr "Forskellige"
 

modules/discopower/locales/el/LC_MESSAGES/discopower.po

@@ -24,6 +24,9 @@ msgstr "Ελβετία"
 msgid "{discopower:tabs:greece}"
 msgstr "Ελλάδα"
 
+msgid "{discopower:tabs:southafrica}"
+msgstr "Νότια Αφρική"
+
 msgid "{discopower:tabs:kalmar}"
 msgstr "Kalmar"
 
@@ -75,6 +78,9 @@ msgstr "Νορβηγία"
 msgid "Greece"
 msgstr "Ελλάδα"
 
+msgid "South Africa"
+msgstr "Νότια Αφρική"
+
 msgid "Miscellaneous"
 msgstr "Άλλοι φορείς"
 

modules/discopower/locales/en/LC_MESSAGES/discopower.po

@@ -24,6 +24,9 @@ msgstr "Switzerland"
 msgid "{discopower:tabs:greece}"
 msgstr "Greece"
 
+msgid "{discopower:tabs:southafrica}"
+msgstr "South Africa"
+
 msgid "{discopower:tabs:kalmar}"
 msgstr "Kalmar"
 
@@ -75,6 +78,9 @@ msgstr "Norway"
 msgid "Greece"
 msgstr "Greece"
 
+msgid "South Africa"
+msgstr "South Africa"
+
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 

modules/discopower/locales/es/LC_MESSAGES/discopower.po

@@ -24,6 +24,9 @@ msgstr "Suiza"
 msgid "{discopower:tabs:greece}"
 msgstr "Grecia"
 
+msgid "{discopower:tabs:southafrica}"
+msgstr "Sudáfrica"
+
 msgid "{discopower:tabs:kalmar}"
 msgstr "Kalmar"
 
@@ -75,6 +78,9 @@ msgstr "Noruega"
 msgid "Greece"
 msgstr "Grecia"
 
+msgid "South Africa"
+msgstr "Sudáfrica"
+
 msgid "Miscellaneous"
 msgstr "Otros"
 

modules/discopower/locales/gl/LC_MESSAGES/discopower.po

@@ -21,6 +21,9 @@ msgstr "Suiza"
 msgid "{discopower:tabs:greece}"
 msgstr "Grecia"
 
+msgid "{discopower:tabs:southafrica}"
+msgstr "Suráfrica"
+
 msgid "{discopower:tabs:denmark}"
 msgstr "Dinamarca"
 
@@ -60,6 +63,9 @@ msgstr "Noruega"
 msgid "Greece"
 msgstr "Grecia"
 
+msgid "South Africa"
+msgstr "Suráfrica"
+
 msgid "Miscellaneous"
 msgstr "Miscelanea"
 

modules/discopower/locales/nl/LC_MESSAGES/discopower.po

@@ -24,6 +24,9 @@ msgstr "Zwitserland"
 msgid "{discopower:tabs:greece}"
 msgstr "Griekenland"
 
+msgid "{discopower:tabs:southafrica}"
+msgstr "Zuid-Afrika"
+
 msgid "{discopower:tabs:kalmar}"
 msgstr "Kalmar"
 
@@ -75,6 +78,9 @@ msgstr "Noorwegen"
 msgid "Greece"
 msgstr "Griekenland"
 
+msgid "South Africa"
+msgstr "Zuid-Afrika"
+
 msgid "Miscellaneous"
 msgstr "Overige"
 

modules/discopower/locales/ru/LC_MESSAGES/discopower.po

@@ -31,6 +31,9 @@ msgstr "Дания"
 msgid "{discopower:tabs:sweden}"
 msgstr "Швеция"
 
+msgid "{discopower:tabs:southafrica}"
+msgstr "Южная Африка"
+
 msgid "{discopower:tabs:edugain}"
 msgstr "Европа (eduGAIN)"
 
@@ -49,6 +52,9 @@ msgstr "Разное"
 msgid "Sweden"
 msgstr "Швеция"
 
+msgid "South Africa"
+msgstr "Южная Африка"
+
 msgid "Denmark"
 msgstr "Дания"
 

modules/discopower/locales/zh-tw/LC_MESSAGES/discopower.po

@@ -30,6 +30,9 @@ msgstr "丹麥"
 msgid "{discopower:tabs:sweden}"
 msgstr "瑞典"
 
+msgid "{discopower:tabs:southafrica}"
+msgstr "南非"
+
 msgid "{discopower:tabs:edugain}"
 msgstr "歐洲 (eduGAIN)"
 
@@ -51,6 +54,9 @@ msgstr "雜項"
 msgid "Sweden"
 msgstr "瑞典"
 
+msgid "South Africa"
+msgstr "南非"
+
 msgid "Denmark"
 msgstr "丹麥"