From c926642bff4fe35c23b52589c36785546629949f Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Mon, 4 Jan 2016 19:47:02 +0300 Subject: [PATCH] PreRelease commit --- dev/App/User.jsx | 13 +-- dev/Common/Globals.js | 1 + dev/Remote/User/Ajax.js | 2 +- dev/Stores/User/Message.js | 8 +- package.json | 4 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 12 ++- .../v/0.0.0/app/localization/admin/nl_NL.yml | 8 ++ .../0.0.0/app/localization/webmail/es_ES.yml | 95 ++++++++++--------- .../0.0.0/app/localization/webmail/nb_NO.yml | 12 +-- .../0.0.0/app/localization/webmail/nl_NL.yml | 1 + vendors/flags/flags-fixed.css | 2 +- 11 files changed, 80 insertions(+), 78 deletions(-) diff --git a/dev/App/User.jsx b/dev/App/User.jsx index df8dbe5ce..260b855b5 100644 --- a/dev/App/User.jsx +++ b/dev/App/User.jsx @@ -653,7 +653,7 @@ class AppUser extends AbstractApp MessageStore.initUidNextAndNewMessages(folder.fullNameRaw, data.Result.UidNext, data.Result.NewMessages); const hash = Cache.getFolderHash(data.Result.Folder); - if (data.Result.Hash !== hash || '' === hash) + if (data.Result.Hash !== hash || '' === hash || unreadCountChange) { if (folder.fullNameRaw === FolderStore.currentFolderFullNameRaw()) { @@ -664,17 +664,6 @@ class AppUser extends AbstractApp this.recacheInboxMessageList(); } } - else if (unreadCountChange) - { - if (folder.fullNameRaw === FolderStore.currentFolderFullNameRaw()) - { - list = MessageStore.messageList(); - if (Utils.isNonEmptyArray(list)) - { - this.folderInformation(folder.fullNameRaw, list); - } - } - } } } } diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js index ca92e1dd0..2a857a25d 100644 --- a/dev/Common/Globals.js +++ b/dev/Common/Globals.js @@ -155,6 +155,7 @@ 'fillEmptyBlocks': false, 'ignoreEmptyParagraph': true, + 'disableNativeSpellChecker': false, 'font_defaultLabel': 'Arial', 'fontSize_defaultLabel': '13', diff --git a/dev/Remote/User/Ajax.js b/dev/Remote/User/Ajax.js index 0e666f7c0..8da2324af 100644 --- a/dev/Remote/User/Ajax.js +++ b/dev/Remote/User/Ajax.js @@ -479,7 +479,7 @@ } else if (SettingsStore.useThreads()) { - require('App/User').default.default.reloadFlagsCurrentMessageListAndMessageFromCache(); + require('App/User').default.reloadFlagsCurrentMessageListAndMessageFromCache(); } }; diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js index 37d43ee7c..cc05e721c 100644 --- a/dev/Stores/User/Message.js +++ b/dev/Stores/User/Message.js @@ -289,13 +289,9 @@ { NotificationStore.displayDesktopNotification( Links.notificationMailIcon(), - MessageHelper.emailArrayToString( - MessageHelper.emailArrayFromJson(aNewMessages[iIndex].From), false), + MessageHelper.emailArrayToString(MessageHelper.emailArrayFromJson(aNewMessages[iIndex].From), false), aNewMessages[iIndex].Subject, - { - 'Folder': aNewMessages[iIndex].Folder, - 'Uid': aNewMessages[iIndex].Uid - } + {'Folder': aNewMessages[iIndex].Folder, 'Uid': aNewMessages[iIndex].Uid} ); } } diff --git a/package.json b/package.json index cfa25cc6a..3c9a96468 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.9.4", - "release": "387", + "release": "394", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "gulpfile.js", @@ -40,7 +40,7 @@ "plugins" ], "readmeFilename": "README.md", - "ownCloudPackageVersion": "4.9", + "ownCloudPackageVersion": "4.10", "engines": { "node": ">= 0.10.0" }, diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index adecf41a9..5b296a7a6 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -8763,14 +8763,18 @@ class Actions $iCode = 0; $sContentType = ''; - $sData = $this->Http()->GetUrlAsString('http://gravatar.com/avatar/'.\md5($sEmail).'.jpg?s=80&d=404', - null, $sContentType, $iCode, $this->Logger(), 5, + $sGravatarUrl = 'http://gravatar.com/avatar/'.\md5($sEmail).'.jpg?s=80&d=404'; + + $this->Logger()->Write('gravatar: '.$sGravatarUrl); + + $sData = $this->Http()->GetUrlAsString($sGravatarUrl, null, $sContentType, $iCode, null, 5, $this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', '')); $sContentType = \strtolower(\trim($sContentType)); - if (200 !== $iCode || empty($sData) || - !\in_array($sContentType, array('image/jpeg', 'image/jpg', 'image/png'))) + if (200 !== $iCode || empty($sData) || !\in_array($sContentType, array('image/jpeg', 'image/jpg', 'image/png'))) { + $this->Logger()->Write('gravatar: code: '.$iCode.', content-type: '.$sContentType); + $sData = ''; $aMatch = array(); diff --git a/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml b/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml index f318940a8..d1a8cc8d5 100644 --- a/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml +++ b/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml @@ -31,6 +31,7 @@ nl_NL: LEGEND_MAIN: "Diverse" LABEL_ATTACHMENT_SIZE_LIMIT: "Maximale bijlage grootte" LABEL_ALLOW_ADDITIONAL_ACCOUNTS: "Sta extra accounts toe" + LABEL_ALLOW_IDENTITIES: "Meerdere identiteiten toestaan" LABEL_ALLOW_TEMPLATES: "Sta templates toe" ALERT_WARNING: "Waarschuwing!" HTML_ALERT_WEAK_PASSWORD: | @@ -58,6 +59,7 @@ nl_NL: LEGEND_USER: "Gebruiker" LABEL_USER_LOGO: "Logo" LABEL_USER_LOGO_TITLE: "Logo titel" + LABEL_USER_LOGO_MESSAGE: "Logo (Message View)" LABEL_USER_CUSTOM_CSS: "Aangepaste CSS" LEGEND_WELCOME_PAGE: "Welcom pagina" LABEL_WELCOME_PAGE_TITLE: "Titel" @@ -178,6 +180,12 @@ nl_NL: LABEL_ACTIVATED: "Activated" ERROR_INVALID_SUBS_KEY: "Invalid Subscription Key" SUBS_KEY_ACTIVATED: "Subscription Key Activated Successfully" + HTML_DESC: | + Na activatie wordt het premium abonnement voor %DOMAIN% verlengd. +
+ Let op: een activatie code kan slechts voor één domein worden gebruikt. +

+ Het activatieproces kan niet meer worden afgebroken of geannuleerd nadat het is gestart. POPUPS_DOMAIN: TITLE_ADD_DOMAIN: "Add Domain" TITLE_ADD_DOMAIN_WITH_NAME: "Add Domain \"%NAME%\"" diff --git a/rainloop/v/0.0.0/app/localization/webmail/es_ES.yml b/rainloop/v/0.0.0/app/localization/webmail/es_ES.yml index 468f8c73b..1c308821b 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/es_ES.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/es_ES.yml @@ -3,15 +3,15 @@ es_ES: LABEL_EMAIL: "Email" LABEL_LOGIN: "Login" LABEL_PASSWORD: "Contraseña" - LABEL_SIGN_ME: "Recuerdame" + LABEL_SIGN_ME: "Recuérdame" LABEL_VERIFICATION_CODE: "Código de verificación" LABEL_DONT_ASK_VERIFICATION_CODE: "No solicitar el código de verificación durante 2 semanas" BUTTON_SIGN_IN: "Ingresar" TITLE_SIGN_IN_GOOGLE: "Ingresar usando Google" TITLE_SIGN_IN_FACEBOOK: "Ingresar usando Facebook" TITLE_SIGN_IN_TWITTER: "Ingresar usando Twitter" - LABEL_FORGOT_PASSWORD: "Forgot password" - LABEL_REGISTRATION: "Registration" + LABEL_FORGOT_PASSWORD: "Olvidé mi contraseña" + LABEL_REGISTRATION: "Registro" TOP_TOOLBAR: BUTTON_ADD_ACCOUNT: "Agregar cuenta" BUTTON_SETTINGS: "Configuración" @@ -38,15 +38,15 @@ es_ES: LABEL_ADV_DATE_YEAR: "Hasta 1 año de antiguedad" BUTTON_ADV_SEARCH: "Buscar" PREVIEW_POPUP: - FULLSCREEN: "Toggle fullscreen" - ZOOM: "Zoom in/out" + FULLSCREEN: "Cambiar a pantalla completa" + ZOOM: "Acercar / Alejar" CLOSE: "Cerrar (Esc)" LOADING: "Cargando" GALLERY_PREV: "Anteriores (Flecha Izquierda)" GALLERY_NEXT: "Siguiente (Flecha Derecha)" GALLERY_COUNTER: "%curr% de %total%" - IMAGE_ERROR: "La imagen no pudo ser cargada." - AJAX_ERROR: "El contenido no pudo ser cargado." + IMAGE_ERROR: "La imágen no pudo ser cargada." + AJAX_ERROR: "El contenido no pudo ser cargado." FOLDER_LIST: BUTTON_COMPOSE: "Redactar" BUTTON_CONTACTS: "Contactos" @@ -64,7 +64,7 @@ es_ES: BUTTON_DELETE: "Eliminar" BUTTON_ARCHIVE: "Archivo" BUTTON_SPAM: "Marcar como Spam (Basura)" - BUTTON_NOT_SPAM: "Not Spam" + BUTTON_NOT_SPAM: "No es Spam" BUTTON_EMPTY_FOLDER: "Vaciar carpeta" BUTTON_MULTY_FORWARD: "Reenviar mensajes" BUTTON_DELETE_WITHOUT_MOVE: "Eliminar permanentemente" @@ -72,8 +72,8 @@ es_ES: MENU_SET_SEEN: "Marcar como leído" MENU_SET_ALL_SEEN: "Marcar todo como leído" MENU_UNSET_SEEN: "Marcar como no leído" - MENU_SET_FLAG: "Destacar" - MENU_UNSET_FLAG: "No destacar" + MENU_SET_FLAG: "Marcar" + MENU_UNSET_FLAG: "Desmarcar" MENU_SELECT_ALL: "Todos" MENU_SELECT_NONE: "Ninguno" MENU_SELECT_INVERT: "Invertir" @@ -84,14 +84,14 @@ es_ES: EMPTY_LIST: "No hay mensajes." EMPTY_SEARCH_LIST: "La búsqueda no ha producido resultados." SEARCH_RESULT_FOR: "Resultados de búsqueda para \"%SEARCH%\"" - BACK_TO_MESSAGE_LIST: "back to message list" + BACK_TO_MESSAGE_LIST: "volver a la lista de mensajes" LIST_LOADING: "Cargando" EMPTY_SUBJECT_TEXT: "(Sin asunto)" PUT_MESSAGE_HERE: "Arrastre su mensaje aquí para verlo en la lista" TODAY_AT: "hoy a las %TIME%" YESTERDAY_AT: "ayer a las %TIME%" SEARCH_PLACEHOLDER: "Buscar" - NEW_MESSAGE_NOTIFICATION: "Usted tiene %COUNT% nuevos mensajes!" + NEW_MESSAGE_NOTIFICATION: "¡Usted tiene %COUNT% nuevos mensajes!" QUOTA_SIZE: "Usando %SIZE% (%PROC%%) de sus %LIMIT%" MESSAGE: BUTTON_EDIT: "Editar" @@ -100,7 +100,7 @@ es_ES: BUTTON_DELETE: "Eliminar" BUTTON_ARCHIVE: "Archive" BUTTON_SPAM: "Spam (Basura)" - BUTTON_NOT_SPAM: "Not Spam" + BUTTON_NOT_SPAM: "No es Spam" BUTTON_MOVE_TO: "Mover a" BUTTON_MORE: "Más" BUTTON_REPLY: "Responder" @@ -112,9 +112,9 @@ es_ES: BUTTON_NOTIFY_READ_RECEIPT: "El remitente ha pedido que se le notifique cuando usted lea este mensaje." BUTTON_IN_NEW_WINDOW: "Ver en una ventana nueva" BUTTON_THREAD_LIST: "Thread list" - BUTTON_THREAD_PREV: "Previous" - BUTTON_THREAD_NEXT: "Next" - BUTTON_THREAD_MORE: "More messages" + BUTTON_THREAD_PREV: "Anterior" + BUTTON_THREAD_NEXT: "Siguiente" + BUTTON_THREAD_MORE: "Más Mensajes" MENU_HEADERS: "Mostrar los encabezados del mensaje" MENU_VIEW_ORIGINAL: "Mostrar original" MENU_DOWNLOAD_ORIGINAL: "Descargar como archivo .eml" @@ -128,13 +128,13 @@ es_ES: LABEL_TO: "Para" LABEL_TO_SHORT: "para" LABEL_CC: "CC" - LABEL_BCC: "BCC" + LABEL_BCC: "CCO (BCC)" LABEL_REPLY_TO: "Reply-To" PRINT_LABEL_FROM: "De" PRINT_LABEL_TO: "Para" PRINT_LABEL_CC: "CC" - PRINT_LABEL_BCC: "BCC" - PRINT_LABEL_REPLY_TO: "Reply-To" + PRINT_LABEL_BCC: "CCO (BCC)" + PRINT_LABEL_REPLY_TO: "Responder a" PRINT_LABEL_DATE: "Fecha" PRINT_LABEL_SUBJECT: "Asunto" PRINT_LABEL_ATTACHMENTS: "Adjuntos" @@ -143,9 +143,9 @@ es_ES: PGP_PASSWORD_INPUT_PLACEHOLDER: "Contraseña" PGP_SIGNED_MESSAGE_DESC: "Mensaje firmado mediante OpenPGP (click para verificar)" PGP_ENCRYPTED_MESSAGE_DESC: "Mensaje cifrado mediante OpenPGP (click para desencriptar)" - LINK_DOWNLOAD_AS_ZIP: "Download as zip" - LINK_SAVE_TO_OWNCLOUD: "Save to ownCloud" - LINK_SAVE_TO_DROPBOX: "Save to Dropbox" + LINK_DOWNLOAD_AS_ZIP: "Descargar todo (archivo ZIP)" + LINK_SAVE_TO_OWNCLOUD: "Guardar en ownCloud" + LINK_SAVE_TO_DROPBOX: "Guardar en Dropbox" READ_RECEIPT: SUBJECT: "Acuse de recibo (se visualiza) - %SUBJECT%" BODY: | @@ -168,31 +168,31 @@ es_ES: LIST_LOADING: "Cargando" EMPTY_LIST: "No hay contactos aquí" EMPTY_SEARCH: "No se encontraron contactos" - CLEAR_SEARCH: "Reiniciar búsqueda" + CLEAR_SEARCH: "Limpiar búsqueda" CONTACT_VIEW_DESC: "Seleccionar un contacto en la lista para verlo aquí." LABEL_DISPLAY_NAME: "Nombre a visualizar" - LABEL_EMAIL: "Email" + LABEL_EMAIL: "Correo Electrónico" LABEL_PHONE: "Teléfono" - LABEL_WEB: "Web" + LABEL_WEB: "Sitio Web" LABEL_BIRTHDAY: "Cumpleaños" LINK_ADD_EMAIL: "Agregar una dirección de correo electrónico" LINK_ADD_PHONE: "Agregar un teléfono" LINK_BIRTHDAY: "Cumpleaños" - PLACEHOLDER_ENTER_DISPLAY_NAME: "Entrar nombre a visualizar" - PLACEHOLDER_ENTER_LAST_NAME: "Entrar apellidos" - PLACEHOLDER_ENTER_FIRST_NAME: "Entrar nombre" - PLACEHOLDER_ENTER_NICK_NAME: "Entrar alias" + PLACEHOLDER_ENTER_DISPLAY_NAME: "Ingese nombre a visualizar" + PLACEHOLDER_ENTER_LAST_NAME: "Ingrese apellidos" + PLACEHOLDER_ENTER_FIRST_NAME: "Ingrese nombre" + PLACEHOLDER_ENTER_NICK_NAME: "Ingresar un alias" LABEL_READ_ONLY: "Solo lectura" LABEL_SHARE: "Compartir" ADD_MENU_LABEL: "Agregar" ADD_MENU_NICKNAME: "Alias" ADD_MENU_NOTES: "Notas" - ADD_MENU_EMAIL: "Email" + ADD_MENU_EMAIL: "Correo Electrónico" ADD_MENU_PHONE: "Teléfono" ADD_MENU_URL: "URL" ADD_MENU_ADDRESS: "Dirección" ADD_MENU_BIRTHDAY: "Cumpleaños" - ADD_MENU_TAGS: "Tags" + ADD_MENU_TAGS: "Etiquetas" BUTTON_SHARE_NONE: "Ninguno" BUTTON_SHARE_ALL: "Todos" BUTTON_SYNC: "Sincronización (CardDAV)" @@ -200,7 +200,7 @@ es_ES: TITLE_FROM: "De" TITLE_TO: "Para" TITLE_CC: "CC" - TITLE_BCC: "BCC" + TITLE_BCC: "CCO (BCC)" TITLE_REPLY_TO: "Responder a" TITLE_SUBJECT: "Asunto" LINK_SHOW_INPUTS: "mostrar todos los campos" @@ -208,12 +208,12 @@ es_ES: BUTTON_SAVE: "Guardar" BUTTON_DELETE: "Eliminar" BUTTON_CANCEL: "Cancelar" - BUTTON_MINIMIZE: "Minimize" + BUTTON_MINIMIZE: "Minimizar" SAVED_TIME: "Guardado a las %TIME%" SAVED_ERROR_ON_SEND: "El Mensaje se envió pero no se guardó en la carpeta de Enviados" DISCARD_UNSAVED_DATA: "Discard unsaved data?" ATTACH_FILES: "Añadir archivos" - ATTACH_DROP_FILES_DESC: "Arrastre sus archivos aquí" + ATTACH_DROP_FILES_DESC: "Arrastre los archivos aquí" ATTACH_ITEM_CANCEL: "Cancelar" DROPBOX: "Dropbox" GOOGLE_DRIVE: "Google Drive" @@ -226,15 +226,17 @@ es_ES: FORWARD_MESSAGE_TOP_SUBJECT: "Asunto" EMPTY_TO_ERROR_DESC: "Por favor especifique al menos un destinatario" NO_ATTACHMENTS_HERE_DESC: "No attachments here." - ATTACHMENTS_ERROR_DESC: "Warning! Not all attachments have been uploaded." - ATTACHMENTS_UPLOAD_ERROR_DESC: "Not all attachments have been uploaded yet" + ATTACHMENTS_ERROR_DESC: "¡Atención! No se han subido todos los archivos adjuntos." + ATTACHMENTS_UPLOAD_ERROR_DESC: "No se han subido todos los archivos adjuntos." BUTTON_REQUEST_READ_RECEIPT: "Solicitar confirmación de lectura" - BUTTON_MARK_AS_IMPORTANT: "Mark as important" - BUTTON_OPEN_PGP: "OpenPGP (Plain Text Only)" + BUTTON_MARK_AS_IMPORTANT: "Marcar como Importante" + BUTTON_OPEN_PGP: "OpenPGP (solo texto plano)" BUTTON_REQUEST_DSN: "Request a delivery receipt" POPUPS_WELCOME_PAGE: - BUTTON_CLOSE: "Close" + BUTTON_CLOSE: "Cerrar" POPUPS_ASK: + BUTTON_YES: "Sí" + BUTTON_NO: "No" DESC_WANT_CLOSE_THIS_WINDOW: "¿Está seguro que desea cerrar esta ventana?" DESC_WANT_DELETE_MESSAGES: "¿Está seguro que desea eliminar los mensajes?" POPUPS_LANGUAGES: @@ -242,19 +244,19 @@ es_ES: POPUPS_ADD_ACCOUNT: TITLE_ADD_ACCOUNT: "Añadir cuenta" BUTTON_ADD_ACCOUNT: "Añadir" - TITLE_UPDATE_ACCOUNT: "Update Account?" - BUTTON_UPDATE_ACCOUNT: "Update" + TITLE_UPDATE_ACCOUNT: "¿Actualizar cuenta?" + BUTTON_UPDATE_ACCOUNT: "Actualizar" POPUPS_IDENTITY: TITLE_ADD_IDENTITY: "¿Añadir Identidad?" TITLE_UPDATE_IDENTITY: "¿Actualizar identidad?" BUTTON_ADD_IDENTITY: "Agregar" BUTTON_UPDATE_IDENTITY: "Actualizar" - LABEL_EMAIL: "Email" + LABEL_EMAIL: "Correo Electrónico" LABEL_NAME: "Nombre" LABEL_REPLY_TO: "Responder a" - LABEL_SIGNATURE: "Signature" + LABEL_SIGNATURE: "Firma" LABEL_CC: "Cc" - LABEL_BCC: "Bcc" + LABEL_BCC: "Cco (Bcc)" LABEL_SIGNATURE_INSERT_BEFORE: "Insert this signature before quoted text in replies" POPUPS_CREATE_FOLDER: TITLE_CREATE_FOLDER: "Crear una carpeta" @@ -265,11 +267,11 @@ es_ES: BUTTON_CLOSE: "Cerrar" TITLE_CREATING_PROCESS: "Creando carpeta" POPUPS_CLEAR_FOLDER: - TITLE_CLEAR_FOLDER: "Limpiar todos los mensajes de la carpeta?" + TITLE_CLEAR_FOLDER: "¿Limpiar todos los mensajes de la carpeta?" BUTTON_CLEAR: "Limpiar" BUTTON_CANCEL: "Cancelar" BUTTON_CLOSE: "Cerrar" - DANGER_DESC_WARNING: "Atención!" + DANGER_DESC_WARNING: "¡Atención!" DANGER_DESC_HTML_1: "Con esta acción usted puede borrar todos los emails de la carpeta %FOLDER% completamente." DANGER_DESC_HTML_2: "Una vez comenzado, el proceso no puede ser abortado ni cancelado." TITLE_CLEARING_PROCESS: "Limpiando carpeta..." @@ -682,6 +684,7 @@ es_ES: DEMO_SEND_MESSAGE_ERROR: "Por razones de seguridad, esta cuenta demo no permite enviar mensajes a direcciones de correo electrónico externas!" DEMO_ACCOUNT_ERROR: "For security purposes, this account is not allowed for this action!" ACCOUNT_ALREADY_EXISTS: "La cuenta ya existe" + ACCOUNT_DOES_NOT_EXIST: "La cuenta no existe" MAIL_SERVER_ERROR: "Ocurrió un error mientras se accedía al servidor" INVALID_INPUT_ARGUMENT: "Invalid input argument" UNKNOWN_ERROR: "Error desconocido" diff --git a/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml b/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml index 739ad67fb..d5e862cad 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml @@ -26,7 +26,7 @@ nb_NO: LABEL_ADV_TEXT: "Tekst" LABEL_ADV_HAS_ATTACHMENT: "Har vedlegg" LABEL_ADV_HAS_ATTACHMENTS: "Har vedlegg" - LABEL_ADV_FLAGGED: "Markert for oppfølging" + LABEL_ADV_FLAGGED: "Stjernemerket" LABEL_ADV_UNSEEN: "Ulest" LABEL_ADV_DATE: "Dato" LABEL_ADV_DATE_ALL: "Alle" @@ -72,15 +72,15 @@ nb_NO: MENU_SET_SEEN: "Merk som lest" MENU_SET_ALL_SEEN: "Merk alle som lest" MENU_UNSET_SEEN: "Merk som ulest" - MENU_SET_FLAG: "Flagg" - MENU_UNSET_FLAG: "Fjern flagg" + MENU_SET_FLAG: "Legg til stjerne" + MENU_UNSET_FLAG: "Fjern stjerne" MENU_SELECT_ALL: "Alle" MENU_SELECT_NONE: "Ingen" MENU_SELECT_INVERT: "Inverter" MENU_SELECT_UNSEEN: "Ulest" MENU_SELECT_SEEN: "Lest" - MENU_SELECT_FLAGGED: "Markert for oppfølging" - MENU_SELECT_UNFLAGGED: "Ikke markert for oppfølging" + MENU_SELECT_FLAGGED: "Stjernemerket" + MENU_SELECT_UNFLAGGED: "Ikke stjernemerket" EMPTY_LIST: "Tom liste" EMPTY_SEARCH_LIST: "Søket ga ingen treff." SEARCH_RESULT_FOR: "Søketreff for «%SEARCH%»" @@ -592,7 +592,7 @@ nb_NO: LABEL_MOVE: "Flytt" LABEL_READ: "Merk som lest" LABEL_UNREAD: "Merk som ulest" - LABEL_IMPORTANT: "Merk som flagget/viktig" + LABEL_IMPORTANT: "Merk valgte meldinger med stjerne" LABEL_SEARCH: "Søk" LABEL_CANCEL_SEARCH: "Avbryt søk" LABEL_FULLSCREEN_ENTER: "Fullskjerm" diff --git a/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml b/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml index ca3b150d8..fd291998e 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml @@ -680,6 +680,7 @@ nl_NL: DEMO_SEND_MESSAGE_ERROR: "Vanwege beveiliging is het niet toegestaan dat deze demo account e-mail naar extern verzend!" DEMO_ACCOUNT_ERROR: "Vanwege beveiliging is deze actie niet toegestaan voor deze account!" ACCOUNT_ALREADY_EXISTS: "Account bestaat al" + ACCOUNT_DOES_NOT_EXIST: "Account bestaat niet." MAIL_SERVER_ERROR: "Fout bij toegang tot de mail Server" INVALID_INPUT_ARGUMENT: "Ongeldig invoer argument" UNKNOWN_ERROR: "Er is een onbekende fout opgetreden" diff --git a/vendors/flags/flags-fixed.css b/vendors/flags/flags-fixed.css index 1dde6907d..2ae3fbc66 100644 --- a/vendors/flags/flags-fixed.css +++ b/vendors/flags/flags-fixed.css @@ -23,7 +23,7 @@ .flag.flag-nl_nl {background-position: -80px -110px} .flag.flag-nb_no {background-position: -96px -110px} .flag.flag-it_it {background-position: -208px -66px} -.flag.flag-de_de {background-position: -208px -66px} +.flag.flag-de_de {background-position: -80px -33px} .flag.flag-ro_ro {background-position: -192px -121px} .flag.flag-fr_fr {background-position: -144px -44px} .flag.flag-fr_ca {background-position: -144px -44px}