Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af91df45 authored by Akhil's avatar Akhil 🙂
Browse files

Resolve merge conflicts

parents 5a0404b5 6685451d

apps/dav/l10n/sv.js

+5 −1
Original line number Diff line number Diff line 
OC.L10N.register(

    "dav",

    {

    "Maybe" : "Kanske"

    "Maybe" : "Kanske",

    "This occurrence has been updated,<br> please review highlighted information below:" : "Denna förekomst har uppdaterats,<br> granska markerad information nedan:",

    "This event has been updated,<br> please review the information below:" : "Denna händelse har uppdaterats,<br> granska informationen nedan:",

    "This recurring event has been updated,<br> please review the information below:" : "Denna återkommande händelse har uppdaterats,<br> granska informationen nedan:",

    "The event has been cancelled" : "Denna händelse är inställd"

},

"nplurals=2; plural=n != 1;");

apps/dav/l10n/sv.json

+5 −1
Original line number Diff line number Diff line 
{ "translations": {

    "Maybe" : "Kanske"

    "Maybe" : "Kanske",

    "This occurrence has been updated,<br> please review highlighted information below:" : "Denna förekomst har uppdaterats,<br> granska markerad information nedan:",

    "This event has been updated,<br> please review the information below:" : "Denna händelse har uppdaterats,<br> granska informationen nedan:",

    "This recurring event has been updated,<br> please review the information below:" : "Denna återkommande händelse har uppdaterats,<br> granska informationen nedan:",

    "The event has been cancelled" : "Denna händelse är inställd"

},"pluralForm" :"nplurals=2; plural=n != 1;"

}
 
 No newline at end of file

apps/dav/translationfiles/sv/dav.po

+6 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ msgstr "" 
"Project-Id-Version: PACKAGE VERSION\n"

"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2023-05-16 12:03+0530\n"

"PO-Revision-Date: 2024-02-05 21:52+0000\n"

"PO-Revision-Date: 2024-07-11 03:52+0000\n"

"Last-Translator: Kristian Nordin <kristian.po@proton.me>\n"

"Language-Team: Swedish <https://i18n.e.foundation/projects/"

"murena-cloud-theme/dav/sv/>\n"
@@ -13,7 +13,7 @@ msgstr "" 
"Content-Type: text/plain; charset=UTF-8\n"

"Content-Transfer-Encoding: 8bit\n"

"Plural-Forms: nplurals=2; plural=n != 1;\n"

"X-Generator: Weblate 5.3.1\n"

"X-Generator: Weblate 5.6.2\n"



#: .translations.Maybe

msgid "Maybe"
@@ -24,17 +24,19 @@ msgid "" 
"This occurrence has been updated,<br> please review highlighted information "

"below:"

msgstr ""

"Denna förekomst har uppdaterats,<br> granska markerad information nedan:"



#: .translations.This+event+has+been+updated,+please+review+the+information+below:

msgid "This event has been updated,<br> please review the information below:"

msgstr ""

msgstr "Denna händelse har uppdaterats,<br> granska informationen nedan:"



#: .translations.This+recurring+event+has+been+updated,+please+review+the+information+below:

msgid ""

"This recurring event has been updated,<br> please review the information "

"below:"

msgstr ""

"Denna återkommande händelse har uppdaterats,<br> granska informationen nedan:"



#: .translations.The+invitation+has+been+cancelled

msgid "The event has been cancelled"

msgstr ""
 
msgstr "Denna händelse är inställd"

apps/user_ldap/l10n/de.js

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ OC.L10N.register( 
        "Please try again or contact your administrator.": "Bitte versuchen Sie es erneut oder kontaktieren Sie Murena Workspace unter helpdesk@murena.com.",

		"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.": "<b>Warnung:</b> Das PHP LDAP-Modul ist nicht installiert, das Backend wird nicht funktionieren. Bitte kontaktieren Sie Murena Workspace unter helpdesk@murena.com, um es zu installieren."

},

"nplurals=2; plural=(n != 1);");
 
"");

apps/user_ldap/l10n/es.js

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ OC.L10N.register( 
		"Please try again or contact your administrator.": "Por favor, inténtelo de nuevo o contacte con Murena Workspace en helpdesk@murena.com.",

		"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.": "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el backend no funcionará. Póngase en contacto con Murena Workspace en helpdesk@murena.com para instalarlo."

},

"nplurals=2; plural=(n != 1);");
 
"");