diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/css/tooltip.scss | 4 | ||||
-rw-r--r-- | core/js/sharedialogview.js | 11 | ||||
-rw-r--r-- | core/l10n/fr.js | 3 | ||||
-rw-r--r-- | core/l10n/fr.json | 3 | ||||
-rw-r--r-- | core/l10n/nl.js | 2 | ||||
-rw-r--r-- | core/l10n/nl.json | 2 | ||||
-rw-r--r-- | core/l10n/sv.js | 12 | ||||
-rw-r--r-- | core/l10n/sv.json | 12 |
8 files changed, 40 insertions, 9 deletions
diff --git a/core/css/tooltip.scss b/core/css/tooltip.scss index bad24adf2af..7c6a2f8a580 100644 --- a/core/css/tooltip.scss +++ b/core/css/tooltip.scss @@ -33,8 +33,8 @@ z-index: 100000; filter: alpha(opacity = 0); &.in { - opacity: 0.9; - filter: alpha(opacity = 90); + opacity: 1; + filter: alpha(opacity = 100); } &.top { diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 007e13dd366..157887fbb94 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -183,15 +183,13 @@ var groups = result.ocs.data.exact.groups.concat(result.ocs.data.groups); var remotes = result.ocs.data.exact.remotes.concat(result.ocs.data.remotes); var lookup = result.ocs.data.lookup; + var emails = [], + circles = []; if (typeof(result.ocs.data.emails) !== 'undefined') { - var emails = result.ocs.data.exact.emails.concat(result.ocs.data.emails); - } else { - var emails = []; + emails = result.ocs.data.exact.emails.concat(result.ocs.data.emails); } if (typeof(result.ocs.data.circles) !== 'undefined') { - var circles = result.ocs.data.exact.circles.concat(result.ocs.data.circles); - } else { - var circles = []; + circles = result.ocs.data.exact.circles.concat(result.ocs.data.circles); } var usersLength; @@ -199,7 +197,6 @@ var remotesLength; var emailsLength; var circlesLength; - var lookupLength; var i, j; diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 0af1365fa35..edbcce86e91 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -53,6 +53,7 @@ OC.L10N.register( "Show all contacts …" : "Montrer tous les contacts...", "There was an error loading your contacts" : "Il y a eu une erreur lors du chargement de vos contacts", "Loading your contacts …" : "Chargement de vos contacts...", + "Looking for {term} …" : "Recherche de {term} ...", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Il y a eu des problèmes à la vérification de l’intégrité du code. Plus d'infos...</a>", "No action available" : "Aucune action disponible", "Settings" : "Paramètres", @@ -167,6 +168,8 @@ OC.L10N.register( "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Partager", + "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Partager avec d'autres personnes en indiquant un nom d'utilisateur, un groupe, un identifiant cloud ou une adresse email.", + "Share with other people by entering a user or group or a federated cloud ID." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou un identifiant cloud.", "Share with other people by entering a user or group or an email address." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou une adresse email.", "Name or email address..." : "Nom ou adresse mail...", "Name or federated cloud ID..." : "Nom ou ID du cloud fédéré...", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 6ec370f579d..500063cc7ea 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -51,6 +51,7 @@ "Show all contacts …" : "Montrer tous les contacts...", "There was an error loading your contacts" : "Il y a eu une erreur lors du chargement de vos contacts", "Loading your contacts …" : "Chargement de vos contacts...", + "Looking for {term} …" : "Recherche de {term} ...", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Il y a eu des problèmes à la vérification de l’intégrité du code. Plus d'infos...</a>", "No action available" : "Aucune action disponible", "Settings" : "Paramètres", @@ -165,6 +166,8 @@ "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Partager", + "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Partager avec d'autres personnes en indiquant un nom d'utilisateur, un groupe, un identifiant cloud ou une adresse email.", + "Share with other people by entering a user or group or a federated cloud ID." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou un identifiant cloud.", "Share with other people by entering a user or group or an email address." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou une adresse email.", "Name or email address..." : "Nom ou adresse mail...", "Name or federated cloud ID..." : "Nom ou ID du cloud fédéré...", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index f373eee36dd..f093534af74 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -57,6 +57,8 @@ OC.L10N.register( "Loading your contacts …" : "Je contacten wordt geladen ...", "Looking for {term} …" : "Kijken voor {term} …", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Er traden problemen op tijdens de code betrouwbaarheidscontrole. Meer informatie…</a>", + "No action available" : "Geen actie beschikbaar", + "Error fetching contact actions" : "Fout bij ophalen contact acties", "Settings" : "Instellingen", "Connection to server lost" : "Verbinding met server verbroken", "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Probleem met laden pagina, herladen over %n seconde","Probleem met laden pagina, herladen over %n seconden"], diff --git a/core/l10n/nl.json b/core/l10n/nl.json index 4dee1bc0731..e206946327b 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -55,6 +55,8 @@ "Loading your contacts …" : "Je contacten wordt geladen ...", "Looking for {term} …" : "Kijken voor {term} …", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Er traden problemen op tijdens de code betrouwbaarheidscontrole. Meer informatie…</a>", + "No action available" : "Geen actie beschikbaar", + "Error fetching contact actions" : "Fout bij ophalen contact acties", "Settings" : "Instellingen", "Connection to server lost" : "Verbinding met server verbroken", "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Probleem met laden pagina, herladen over %n seconde","Probleem met laden pagina, herladen over %n seconden"], diff --git a/core/l10n/sv.js b/core/l10n/sv.js index b5f8f8bfcc7..27364ee10f5 100644 --- a/core/l10n/sv.js +++ b/core/l10n/sv.js @@ -48,7 +48,14 @@ OC.L10N.register( "%s (incompatible)" : "%s (incompatible)", "Following apps have been disabled: %s" : "Följande appar har inaktiverats: %s", "Already up to date" : "Redan uppdaterad", + "No contacts found" : "Inga kontakter hittades", + "Show all contacts …" : "Visa alla kontakter ...", + "There was an error loading your contacts" : "Det uppstod ett fel vid hämtning av dina kontakter", + "Loading your contacts …" : "Laddar dina kontakter ...", + "Looking for {term} …" : "Letar efter {term} …", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Ett problem uppstod under integritetskontrollen av koden. Mer information ... </a>", + "No action available" : "Ingen åtgärd tillgänglig", + "Error fetching contact actions" : "Fel vid hämtning av kontakthändelser", "Settings" : "Inställningar", "Connection to server lost" : "Anslutning till server förlorad", "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem med att ladda sidan, laddar om sidan om %n sekund","Problem med att ladda sidan, laddar om sidan om %n sekunder"], @@ -157,6 +164,10 @@ OC.L10N.register( "{sharee} (email)" : "{sharee} (e-post)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Dela", + "Name or email address..." : "Namn eller e-postadress", + "Name or federated cloud ID..." : "Namn eller federerat cloud-ID", + "Name, federated cloud ID or email address..." : "Namn, federerat cloud-ID eller e-postadress...", + "Name..." : "Namn...", "Error removing share" : "Fel uppstod när delning försökte tas bort", "Non-existing tag #{tag}" : "Icke-existerande tag #{tag}", "restricted" : "begränsad", @@ -253,6 +264,7 @@ OC.L10N.register( "Log in" : "Logga in", "Stay logged in" : "Fortsätt vara inloggad.", "Alternative Logins" : "Alternativa inloggningar", + "Redirecting …" : "Omdirigerar ...", "New password" : "Nytt lösenord", "New Password" : "Nytt lösenord", "Reset password" : "Återställ lösenord", diff --git a/core/l10n/sv.json b/core/l10n/sv.json index e06ab0428ec..2583b380e09 100644 --- a/core/l10n/sv.json +++ b/core/l10n/sv.json @@ -46,7 +46,14 @@ "%s (incompatible)" : "%s (incompatible)", "Following apps have been disabled: %s" : "Följande appar har inaktiverats: %s", "Already up to date" : "Redan uppdaterad", + "No contacts found" : "Inga kontakter hittades", + "Show all contacts …" : "Visa alla kontakter ...", + "There was an error loading your contacts" : "Det uppstod ett fel vid hämtning av dina kontakter", + "Loading your contacts …" : "Laddar dina kontakter ...", + "Looking for {term} …" : "Letar efter {term} …", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Ett problem uppstod under integritetskontrollen av koden. Mer information ... </a>", + "No action available" : "Ingen åtgärd tillgänglig", + "Error fetching contact actions" : "Fel vid hämtning av kontakthändelser", "Settings" : "Inställningar", "Connection to server lost" : "Anslutning till server förlorad", "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem med att ladda sidan, laddar om sidan om %n sekund","Problem med att ladda sidan, laddar om sidan om %n sekunder"], @@ -155,6 +162,10 @@ "{sharee} (email)" : "{sharee} (e-post)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Dela", + "Name or email address..." : "Namn eller e-postadress", + "Name or federated cloud ID..." : "Namn eller federerat cloud-ID", + "Name, federated cloud ID or email address..." : "Namn, federerat cloud-ID eller e-postadress...", + "Name..." : "Namn...", "Error removing share" : "Fel uppstod när delning försökte tas bort", "Non-existing tag #{tag}" : "Icke-existerande tag #{tag}", "restricted" : "begränsad", @@ -251,6 +262,7 @@ "Log in" : "Logga in", "Stay logged in" : "Fortsätt vara inloggad.", "Alternative Logins" : "Alternativa inloggningar", + "Redirecting …" : "Omdirigerar ...", "New password" : "Nytt lösenord", "New Password" : "Nytt lösenord", "Reset password" : "Återställ lösenord", |