From ca0709b46b0fe2e0216620b55b1105dc5d473436 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 30 Oct 2017 13:50:00 +0545 Subject: [PATCH 1/2] Some typos --- tests/js/unit/models/calendarModelSpec.js | 2 +- tests/js/unit/models/simpleEventModelSpec.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/js/unit/models/calendarModelSpec.js b/tests/js/unit/models/calendarModelSpec.js index 91b592232..71a541533 100644 --- a/tests/js/unit/models/calendarModelSpec.js +++ b/tests/js/unit/models/calendarModelSpec.js @@ -41,7 +41,7 @@ describe('The calendar factory', function () { Calendar = _Calendar_; })); - it('should correctly reflect the given paramters', function() { + it('should correctly reflect the given parameters', function() { var components = { vevents: true, vjournals: true, diff --git a/tests/js/unit/models/simpleEventModelSpec.js b/tests/js/unit/models/simpleEventModelSpec.js index 92d35d929..d744e2659 100644 --- a/tests/js/unit/models/simpleEventModelSpec.js +++ b/tests/js/unit/models/simpleEventModelSpec.js @@ -2033,7 +2033,7 @@ DTEND;TZID=Europe/Berlin:20160928T160000 END:VEVENT`.split("\n").join("\r\n")); }); - it ('should parse the repating information - no end', function() { + it ('should parse the repeating information - no end', function() { const ics = `BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//Mac OS X 10.11.6//EN @@ -2068,7 +2068,7 @@ END:VCALENDAR`; }); }); - it ('should parse the repating information - count', function() { + it ('should parse the repeating information - count', function() { const ics = `BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//Mac OS X 10.11.6//EN @@ -2100,7 +2100,7 @@ END:VCALENDAR`; }); }); - it ('should parse the repating information - until', function() { + it ('should parse the repeating information - until', function() { //TODO - UNTIL is not implemented yet /* const ics = `BEGIN:VCALENDAR VERSION:2.0 From 2c2d4a25943fc6b061e3d79f94aaed93e4c28ea2 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 30 Oct 2017 13:50:28 +0545 Subject: [PATCH 2/2] could possibly be --- controller/proxycontroller.php | 2 +- l10n/ca.js | 2 +- l10n/ca.json | 2 +- l10n/cs.js | 2 +- l10n/cs.json | 2 +- l10n/de.js | 2 +- l10n/de.json | 2 +- l10n/de_DE.js | 2 +- l10n/de_DE.json | 2 +- l10n/en_GB.js | 2 +- l10n/en_GB.json | 2 +- l10n/es.js | 2 +- l10n/es.json | 2 +- l10n/es_MX.js | 2 +- l10n/es_MX.json | 2 +- l10n/fi.js | 2 +- l10n/fi.json | 2 +- l10n/he.js | 2 +- l10n/he.json | 2 +- l10n/nb.js | 2 +- l10n/nb.json | 2 +- l10n/pt_BR.js | 2 +- l10n/pt_BR.json | 2 +- l10n/ru.js | 2 +- l10n/ru.json | 2 +- l10n/sl.js | 2 +- l10n/sl.json | 2 +- l10n/sv.js | 2 +- l10n/sv.json | 2 +- l10n/th.js | 2 +- l10n/th.json | 2 +- l10n/zh_CN.js | 2 +- l10n/zh_CN.json | 2 +- tests/php/controller/proxycontrollerTest.php | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/controller/proxycontroller.php b/controller/proxycontroller.php index 8d94690eb..71a932b86 100644 --- a/controller/proxycontroller.php +++ b/controller/proxycontroller.php @@ -149,7 +149,7 @@ public function proxy($url) { $this->logger->debug($e->getMessage()); if (substr($url, 0, 8) === 'https://') { - $message = $this->l10n->t('Error requesting resource on remote server. This could possible be related to a certificate mismatch'); + $message = $this->l10n->t('Error requesting resource on remote server. This could possibly be related to a certificate mismatch'); } else { $message = $this->l10n->t('Error requesting resource on remote server'); } diff --git a/l10n/ca.js b/l10n/ca.js index 2e9be667d..a6cc82486 100644 --- a/l10n/ca.js +++ b/l10n/ca.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Hi ha massa redireccions. Avortant .....", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "El servidor no ha concedit accés al calendari (HTTP [1%s} error)", "Error connecting to remote server" : "Error al connectar al servidor remot", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Error al sol·licitar recursos al servidor remot Això pot estar relacionat amb un problema en el certificat de seguretat.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Error al sol·licitar recursos al servidor remot Això pot estar relacionat amb un problema en el certificat de seguretat.", "Error requesting resource on remote server" : "Error al sol·licitar recursos al servidor remot", "Individual" : "Individual", "Group" : "Grup", diff --git a/l10n/ca.json b/l10n/ca.json index 54c105aa1..43e9ca3c5 100644 --- a/l10n/ca.json +++ b/l10n/ca.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Hi ha massa redireccions. Avortant .....", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "El servidor no ha concedit accés al calendari (HTTP [1%s} error)", "Error connecting to remote server" : "Error al connectar al servidor remot", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Error al sol·licitar recursos al servidor remot Això pot estar relacionat amb un problema en el certificat de seguretat.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Error al sol·licitar recursos al servidor remot Això pot estar relacionat amb un problema en el certificat de seguretat.", "Error requesting resource on remote server" : "Error al sol·licitar recursos al servidor remot", "Individual" : "Individual", "Group" : "Grup", diff --git a/l10n/cs.js b/l10n/cs.js index ecdfcdf00..e9a502b32 100644 --- a/l10n/cs.js +++ b/l10n/cs.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Příliš mnoho přesměrování. Odvolávám ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Vzdálený server nám nepovolil přístup ke kalendáři (HTTP {%s} chyba)", "Error connecting to remote server" : "Chyba při připojování ke vzdálenému serveru", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Chyba při zažádání zdroje na vzdáleném serveru. Toto by mohlo být způsobeno záměnou certifikátu.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Chyba při zažádání zdroje na vzdáleném serveru. Toto by mohlo být způsobeno záměnou certifikátu.", "Error requesting resource on remote server" : "Chyba při zažádání zdroje na vzdáleném serveru.", "Individual" : "Individuální", "Group" : "Skupina", diff --git a/l10n/cs.json b/l10n/cs.json index 8d6b5ae0f..9497f0677 100644 --- a/l10n/cs.json +++ b/l10n/cs.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Příliš mnoho přesměrování. Odvolávám ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Vzdálený server nám nepovolil přístup ke kalendáři (HTTP {%s} chyba)", "Error connecting to remote server" : "Chyba při připojování ke vzdálenému serveru", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Chyba při zažádání zdroje na vzdáleném serveru. Toto by mohlo být způsobeno záměnou certifikátu.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Chyba při zažádání zdroje na vzdáleném serveru. Toto by mohlo být způsobeno záměnou certifikátu.", "Error requesting resource on remote server" : "Chyba při zažádání zdroje na vzdáleném serveru.", "Individual" : "Individuální", "Group" : "Skupina", diff --git a/l10n/de.js b/l10n/de.js index f784e136a..b980650f7 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Zu viele Weiterleitungen, Abbruch...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Der entfernte Server gibt uns keinen Zugriff auf den Kalender (HTTP {%s} Fehler)", "Error connecting to remote server" : "Fehler beim Verbinden mit dem entfernten Server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Fehler beim Anfordern der Ressource auf dem entfernten Server. Dies könnte mit einem nicht gültigen Zertifikat zusammenhängen", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Fehler beim Anfordern der Ressource auf dem entfernten Server. Dies könnte mit einem nicht gültigen Zertifikat zusammenhängen", "Error requesting resource on remote server" : "Fehler beim Anfordern der Ressource auf dem entfernten Server", "Individual" : "individuell", "Group" : "Gruppe", diff --git a/l10n/de.json b/l10n/de.json index 4b4326642..97be7f786 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Zu viele Weiterleitungen, Abbruch...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Der entfernte Server gibt uns keinen Zugriff auf den Kalender (HTTP {%s} Fehler)", "Error connecting to remote server" : "Fehler beim Verbinden mit dem entfernten Server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Fehler beim Anfordern der Ressource auf dem entfernten Server. Dies könnte mit einem nicht gültigen Zertifikat zusammenhängen", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Fehler beim Anfordern der Ressource auf dem entfernten Server. Dies könnte mit einem nicht gültigen Zertifikat zusammenhängen", "Error requesting resource on remote server" : "Fehler beim Anfordern der Ressource auf dem entfernten Server", "Individual" : "individuell", "Group" : "Gruppe", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 0f9a428d9..f7db58c0c 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Zu viele Weiterleitungen, Abbruch...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Der entfernte Server gibt uns keinen Zugriff auf den Kalender (HTTP {%s} Fehler)", "Error connecting to remote server" : "Fehler beim Verbinden mit dem entfernten Server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Fehler beim Anfordern der Ressource auf dem entfernten Server. Dies könnte mit einem nicht gültigen Zertifikat zusammenhängen", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Fehler beim Anfordern der Ressource auf dem entfernten Server. Dies könnte mit einem nicht gültigen Zertifikat zusammenhängen", "Error requesting resource on remote server" : "Fehler beim Anfordern der Ressource auf dem entfernten Server", "Individual" : "individuell", "Group" : "Gruppe", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index 0f38f0979..d627a2df1 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Zu viele Weiterleitungen, Abbruch...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Der entfernte Server gibt uns keinen Zugriff auf den Kalender (HTTP {%s} Fehler)", "Error connecting to remote server" : "Fehler beim Verbinden mit dem entfernten Server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Fehler beim Anfordern der Ressource auf dem entfernten Server. Dies könnte mit einem nicht gültigen Zertifikat zusammenhängen", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Fehler beim Anfordern der Ressource auf dem entfernten Server. Dies könnte mit einem nicht gültigen Zertifikat zusammenhängen", "Error requesting resource on remote server" : "Fehler beim Anfordern der Ressource auf dem entfernten Server", "Individual" : "individuell", "Group" : "Gruppe", diff --git a/l10n/en_GB.js b/l10n/en_GB.js index 9bd33d848..52a80bee6 100644 --- a/l10n/en_GB.js +++ b/l10n/en_GB.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Too many redirects. Aborting ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "The remote server did not give us access to the calendar (HTTP {%s} error)", "Error connecting to remote server" : "Error connecting to remote server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Error requesting resource on remote server. This could possible be related to a certificate mismatch", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Error requesting resource on remote server. This could possibly be related to a certificate mismatch", "Error requesting resource on remote server" : "Error requesting resource on remote server", "Individual" : "Individual", "Group" : "Group", diff --git a/l10n/en_GB.json b/l10n/en_GB.json index c1ffa8b97..47686f1d7 100644 --- a/l10n/en_GB.json +++ b/l10n/en_GB.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Too many redirects. Aborting ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "The remote server did not give us access to the calendar (HTTP {%s} error)", "Error connecting to remote server" : "Error connecting to remote server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Error requesting resource on remote server. This could possible be related to a certificate mismatch", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Error requesting resource on remote server. This could possibly be related to a certificate mismatch", "Error requesting resource on remote server" : "Error requesting resource on remote server", "Individual" : "Individual", "Group" : "Group", diff --git a/l10n/es.js b/l10n/es.js index a0f38fb67..47127b194 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Demasiadas redirecciones, Abortando ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "El servidor remoto no permite el acceso al calendario (HTTP {%s} error)", "Error connecting to remote server" : "Error conectando al servidor remoto", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Error en el servidor remoto. Puede ser debido a un error de certificado", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Error en el servidor remoto. Puede ser debido a un error de certificado", "Error requesting resource on remote server" : "Error en el servidor remoto", "Individual" : "Individual", "Group" : "Grupo", diff --git a/l10n/es.json b/l10n/es.json index 7fda19984..094f3a8b4 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Demasiadas redirecciones, Abortando ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "El servidor remoto no permite el acceso al calendario (HTTP {%s} error)", "Error connecting to remote server" : "Error conectando al servidor remoto", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Error en el servidor remoto. Puede ser debido a un error de certificado", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Error en el servidor remoto. Puede ser debido a un error de certificado", "Error requesting resource on remote server" : "Error en el servidor remoto", "Individual" : "Individual", "Group" : "Grupo", diff --git a/l10n/es_MX.js b/l10n/es_MX.js index 8f6d414c5..56898ee91 100644 --- a/l10n/es_MX.js +++ b/l10n/es_MX.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Han ocurrido muchas redirecciones. Abortando...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "El servidor remoto no concedió acceso al calendario (HTTP {%s} error)", "Error connecting to remote server" : "Error conectando al servidor remoto", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Error recuperando el recurso del servidor remoto. Este posiblemente está relacionado a un certificado extraviado", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Error recuperando el recurso del servidor remoto. Este posiblemente está relacionado a un certificado extraviado", "Error requesting resource on remote server" : "Error recuperando el recurso del servidor remoto", "Individual" : "Individual", "Group" : "Grupo", diff --git a/l10n/es_MX.json b/l10n/es_MX.json index b667bea8f..d9e368a3d 100644 --- a/l10n/es_MX.json +++ b/l10n/es_MX.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Han ocurrido muchas redirecciones. Abortando...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "El servidor remoto no concedió acceso al calendario (HTTP {%s} error)", "Error connecting to remote server" : "Error conectando al servidor remoto", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Error recuperando el recurso del servidor remoto. Este posiblemente está relacionado a un certificado extraviado", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Error recuperando el recurso del servidor remoto. Este posiblemente está relacionado a un certificado extraviado", "Error requesting resource on remote server" : "Error recuperando el recurso del servidor remoto", "Individual" : "Individual", "Group" : "Grupo", diff --git a/l10n/fi.js b/l10n/fi.js index a643951c6..29824b15d 100644 --- a/l10n/fi.js +++ b/l10n/fi.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Liian monta uudelleenohjausta. Keskeytetään ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Etäpalvelin esti pääsyn kalenteriin (HTTP {%s} virhe)", "Error connecting to remote server" : "Virhe etäpalvelimeen kytkeytymisessä", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Virhe etäpalvelimen resurssipyynnössä. Tämä saatta johtua setifikaatin täsmäämättömyydestä.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Virhe etäpalvelimen resurssipyynnössä. Tämä saatta johtua setifikaatin täsmäämättömyydestä.", "Error requesting resource on remote server" : "Virhe etäpalvelimen resurssia pyydettäessä.", "Individual" : "Yksilöllinen", "Group" : "Ryhmä", diff --git a/l10n/fi.json b/l10n/fi.json index 583ec23c0..c710241fa 100644 --- a/l10n/fi.json +++ b/l10n/fi.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Liian monta uudelleenohjausta. Keskeytetään ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Etäpalvelin esti pääsyn kalenteriin (HTTP {%s} virhe)", "Error connecting to remote server" : "Virhe etäpalvelimeen kytkeytymisessä", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Virhe etäpalvelimen resurssipyynnössä. Tämä saatta johtua setifikaatin täsmäämättömyydestä.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Virhe etäpalvelimen resurssipyynnössä. Tämä saatta johtua setifikaatin täsmäämättömyydestä.", "Error requesting resource on remote server" : "Virhe etäpalvelimen resurssia pyydettäessä.", "Individual" : "Yksilöllinen", "Group" : "Ryhmä", diff --git a/l10n/he.js b/l10n/he.js index f0baf738f..e410f0ad3 100644 --- a/l10n/he.js +++ b/l10n/he.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "יותר מדי הפניות מחדש. מבצע ביטול...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "השרת המרוחק אינו מאפשר גישה ללוח השנה ( שגיאת HTTP {%s})", "Error connecting to remote server" : "שגיאה בחיבור לשרת מרוחק", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "שגיאה בבקשת משאב בשרת מרוחק. יתכן ושגיאה זו כשורה לחוסר התאמה בתעודת אימות", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "שגיאה בבקשת משאב בשרת מרוחק. יתכן ושגיאה זו כשורה לחוסר התאמה בתעודת אימות", "Error requesting resource on remote server" : "שגיאה בבקשת משאב בשרת מרוחק", "Individual" : "פרטני", "Group" : "קבוצה", diff --git a/l10n/he.json b/l10n/he.json index 818f33a7b..094927fb9 100644 --- a/l10n/he.json +++ b/l10n/he.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "יותר מדי הפניות מחדש. מבצע ביטול...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "השרת המרוחק אינו מאפשר גישה ללוח השנה ( שגיאת HTTP {%s})", "Error connecting to remote server" : "שגיאה בחיבור לשרת מרוחק", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "שגיאה בבקשת משאב בשרת מרוחק. יתכן ושגיאה זו כשורה לחוסר התאמה בתעודת אימות", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "שגיאה בבקשת משאב בשרת מרוחק. יתכן ושגיאה זו כשורה לחוסר התאמה בתעודת אימות", "Error requesting resource on remote server" : "שגיאה בבקשת משאב בשרת מרוחק", "Individual" : "פרטני", "Group" : "קבוצה", diff --git a/l10n/nb.js b/l10n/nb.js index 359ecda07..926585276 100644 --- a/l10n/nb.js +++ b/l10n/nb.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "For mange omdirigeringer. Avbryter ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Den eksterne serveren ga oss ikke tilgang til kalenderen (HTTP-feil %s)", "Error connecting to remote server" : "Feil ved tilkobling til server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Feil ved forespørsel om ressurs på ekstern server. Denne kan være relatert til en sertifikatkonflikt", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Feil ved forespørsel om ressurs på ekstern server. Denne kan være relatert til en sertifikatkonflikt", "Error requesting resource on remote server" : "Feil ved forespørsel om ressurs på ekstern server", "Individual" : "Individuel", "Group" : "Gruppe", diff --git a/l10n/nb.json b/l10n/nb.json index 39c81f773..1f5c29826 100644 --- a/l10n/nb.json +++ b/l10n/nb.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "For mange omdirigeringer. Avbryter ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Den eksterne serveren ga oss ikke tilgang til kalenderen (HTTP-feil %s)", "Error connecting to remote server" : "Feil ved tilkobling til server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Feil ved forespørsel om ressurs på ekstern server. Denne kan være relatert til en sertifikatkonflikt", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Feil ved forespørsel om ressurs på ekstern server. Denne kan være relatert til en sertifikatkonflikt", "Error requesting resource on remote server" : "Feil ved forespørsel om ressurs på ekstern server", "Individual" : "Individuel", "Group" : "Gruppe", diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index 55e7dc760..a56f9971f 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Muitos redirecionamentos. Abortando ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "O servidor remoto não nos deu acesso ao calendário(erro {%s} HTTP)", "Error connecting to remote server" : "Erro ao conectar-se ao servidor remoto", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Erro ao solicitar recursos no servidor remoto. Isso poderia ser relacionado a uma incompatibilidade de certificado", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Erro ao solicitar recursos no servidor remoto. Isso poderia ser relacionado a uma incompatibilidade de certificado", "Error requesting resource on remote server" : "Erro ao solicitar recursos no servidor remoto", "Individual" : "Individual", "Group" : "Grupo", diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index 95f09fd7c..10bc1dbdc 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Muitos redirecionamentos. Abortando ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "O servidor remoto não nos deu acesso ao calendário(erro {%s} HTTP)", "Error connecting to remote server" : "Erro ao conectar-se ao servidor remoto", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Erro ao solicitar recursos no servidor remoto. Isso poderia ser relacionado a uma incompatibilidade de certificado", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Erro ao solicitar recursos no servidor remoto. Isso poderia ser relacionado a uma incompatibilidade de certificado", "Error requesting resource on remote server" : "Erro ao solicitar recursos no servidor remoto", "Individual" : "Individual", "Group" : "Grupo", diff --git a/l10n/ru.js b/l10n/ru.js index d54bfcd43..0c2afbc99 100644 --- a/l10n/ru.js +++ b/l10n/ru.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Слишком много перенаправлений. Отменить...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Удаленный сервер не предоставил нам доступ к календарю (ошибка {%s} HTTP)", "Error connecting to remote server" : "Ошибка подключения к удаленному серверу", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Ошибка запроса ресурса на удаленном сервере. Это может быть связано с несоответствием сертификата", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Ошибка запроса ресурса на удаленном сервере. Это может быть связано с несоответствием сертификата", "Error requesting resource on remote server" : "Ошибка запроса ресурса на удаленном сервере", "Individual" : "Индивидуально", "Group" : "Группа", diff --git a/l10n/ru.json b/l10n/ru.json index 4490a817f..e33a3876b 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Слишком много перенаправлений. Отменить...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Удаленный сервер не предоставил нам доступ к календарю (ошибка {%s} HTTP)", "Error connecting to remote server" : "Ошибка подключения к удаленному серверу", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Ошибка запроса ресурса на удаленном сервере. Это может быть связано с несоответствием сертификата", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Ошибка запроса ресурса на удаленном сервере. Это может быть связано с несоответствием сертификата", "Error requesting resource on remote server" : "Ошибка запроса ресурса на удаленном сервере", "Individual" : "Индивидуально", "Group" : "Группа", diff --git a/l10n/sl.js b/l10n/sl.js index f6204a7d6..b01f3a59a 100644 --- a/l10n/sl.js +++ b/l10n/sl.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "Zaznanih je preveč preusmeritev. Opravilo bo prekinjeno ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Oddaljeni strežnik ni omogočil dostopa do koledarja (napaka HTTP {%s})", "Error connecting to remote server" : "Napaka med povezovanjem z oddaljenim strežnikom.", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Prišlo je do napake med pridobivanjem podatkov vira na oddaljenem strežniku. Morda je težava v neskladnih povetrdilih.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Prišlo je do napake med pridobivanjem podatkov vira na oddaljenem strežniku. Morda je težava v neskladnih povetrdilih.", "Error requesting resource on remote server" : "Prišlo je do napake med pridobivanjem podatkov vira na oddaljenem strežniku.", "Individual" : "Posamezno", "Group" : "Skupina", diff --git a/l10n/sl.json b/l10n/sl.json index 01ab2d043..acc47be1f 100644 --- a/l10n/sl.json +++ b/l10n/sl.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "Zaznanih je preveč preusmeritev. Opravilo bo prekinjeno ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Oddaljeni strežnik ni omogočil dostopa do koledarja (napaka HTTP {%s})", "Error connecting to remote server" : "Napaka med povezovanjem z oddaljenim strežnikom.", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Prišlo je do napake med pridobivanjem podatkov vira na oddaljenem strežniku. Morda je težava v neskladnih povetrdilih.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Prišlo je do napake med pridobivanjem podatkov vira na oddaljenem strežniku. Morda je težava v neskladnih povetrdilih.", "Error requesting resource on remote server" : "Prišlo je do napake med pridobivanjem podatkov vira na oddaljenem strežniku.", "Individual" : "Posamezno", "Group" : "Skupina", diff --git a/l10n/sv.js b/l10n/sv.js index 23b8ccafc..2686804e9 100644 --- a/l10n/sv.js +++ b/l10n/sv.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "För många omdirigeringar. Avbryter ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Servern gav oss inte åtkomst till kalendern (HTTP {%s} error)", "Error connecting to remote server" : "Fel vid anslutning till server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Fel vid hämtning av resurser från server. Detta kan vara relaterat till missmatchade certifikat.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Fel vid hämtning av resurser från server. Detta kan vara relaterat till missmatchade certifikat.", "Error requesting resource on remote server" : "Fel vid hämtning av resurs från server.", "Individual" : "Individuell", "Group" : "Grupp", diff --git a/l10n/sv.json b/l10n/sv.json index c34e283de..7e91b5be2 100644 --- a/l10n/sv.json +++ b/l10n/sv.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "För många omdirigeringar. Avbryter ...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "Servern gav oss inte åtkomst till kalendern (HTTP {%s} error)", "Error connecting to remote server" : "Fel vid anslutning till server", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "Fel vid hämtning av resurser från server. Detta kan vara relaterat till missmatchade certifikat.", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "Fel vid hämtning av resurser från server. Detta kan vara relaterat till missmatchade certifikat.", "Error requesting resource on remote server" : "Fel vid hämtning av resurs från server.", "Individual" : "Individuell", "Group" : "Grupp", diff --git a/l10n/th.js b/l10n/th.js index 8dc5156a8..6f890ac6c 100644 --- a/l10n/th.js +++ b/l10n/th.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "มีการเปลี่ยนเส้นทางมากเกินไป กำลังยกเลิก...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "รีโมทเซิร์ฟเวอร์ไม่ได้ให้สิทธิ์การเข้าถึงปฏิทิน (ข้อผิดพลาด HTTP {%s})", "Error connecting to remote server" : "เกิดข้อผิดพลาดในการเชื่อมต่อกับรีโมทเซิร์ฟเวอร์", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "เกิดข้อผิดพลาดขณะขอทรัพยากรจากรีโมทเซิร์ฟเวอร์ นี่อาจเป็นปัญหาเกี่ยวกับใบรับรองที่ไม่ตรงกัน", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "เกิดข้อผิดพลาดขณะขอทรัพยากรจากรีโมทเซิร์ฟเวอร์ นี่อาจเป็นปัญหาเกี่ยวกับใบรับรองที่ไม่ตรงกัน", "Error requesting resource on remote server" : "เกิดข้อผิดพลาดขณะขอทรัพยากรจากรีโมทเซิร์ฟเวอร์", "Individual" : "ของแต่ละบุคคล", "Group" : "กลุ่ม", diff --git a/l10n/th.json b/l10n/th.json index d03614897..c702675be 100644 --- a/l10n/th.json +++ b/l10n/th.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "มีการเปลี่ยนเส้นทางมากเกินไป กำลังยกเลิก...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "รีโมทเซิร์ฟเวอร์ไม่ได้ให้สิทธิ์การเข้าถึงปฏิทิน (ข้อผิดพลาด HTTP {%s})", "Error connecting to remote server" : "เกิดข้อผิดพลาดในการเชื่อมต่อกับรีโมทเซิร์ฟเวอร์", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "เกิดข้อผิดพลาดขณะขอทรัพยากรจากรีโมทเซิร์ฟเวอร์ นี่อาจเป็นปัญหาเกี่ยวกับใบรับรองที่ไม่ตรงกัน", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "เกิดข้อผิดพลาดขณะขอทรัพยากรจากรีโมทเซิร์ฟเวอร์ นี่อาจเป็นปัญหาเกี่ยวกับใบรับรองที่ไม่ตรงกัน", "Error requesting resource on remote server" : "เกิดข้อผิดพลาดขณะขอทรัพยากรจากรีโมทเซิร์ฟเวอร์", "Individual" : "ของแต่ละบุคคล", "Group" : "กลุ่ม", diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index 11b821557..f67e7cb0f 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -6,7 +6,7 @@ OC.L10N.register( "Too many redirects. Aborting ..." : "太多次重定向。中止操作...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "远程服务器未允许我们访问日历(HTTP {1%s} 错误)", "Error connecting to remote server" : "连接远程服务器出错", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "请求远程服务器资源出错。问题可能与证书不匹配有关", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "请求远程服务器资源出错。问题可能与证书不匹配有关", "Error requesting resource on remote server" : "请求远程服务器资源出错", "Individual" : "个人", "Group" : "群组", diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index 1574f8d8b..5f156c4e0 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -4,7 +4,7 @@ "Too many redirects. Aborting ..." : "太多次重定向。中止操作...", "The remote server did not give us access to the calendar (HTTP {%s} error)" : "远程服务器未允许我们访问日历(HTTP {1%s} 错误)", "Error connecting to remote server" : "连接远程服务器出错", - "Error requesting resource on remote server. This could possible be related to a certificate mismatch" : "请求远程服务器资源出错。问题可能与证书不匹配有关", + "Error requesting resource on remote server. This could possibly be related to a certificate mismatch" : "请求远程服务器资源出错。问题可能与证书不匹配有关", "Error requesting resource on remote server" : "请求远程服务器资源出错", "Individual" : "个人", "Group" : "群组", diff --git a/tests/php/controller/proxycontrollerTest.php b/tests/php/controller/proxycontrollerTest.php index 969cb9f20..ad732e970 100644 --- a/tests/php/controller/proxycontrollerTest.php +++ b/tests/php/controller/proxycontrollerTest.php @@ -232,7 +232,7 @@ public function testProxyRequestExceptionHTTPS() { $this->exceptionRequest, $this->exceptionResponse))); $this->l10n->expects($this->once()) ->method('t') - ->with($this->equalTo('Error requesting resource on remote server. This could possible be related to a certificate mismatch')) + ->with($this->equalTo('Error requesting resource on remote server. This could possibly be related to a certificate mismatch')) ->will($this->returnValue('translated string 1337')); $this->logger->expects($this->once()) ->method('debug')