Skip to content

Commit 0d37504

Browse files
johnhenleyjohnhenley
authored
Merge pull request #1684 from DNNCommunity/dev
Sync dev to master
2 parents 143446d + 77cac58 commit 0d37504

File tree

127 files changed

+10050
-3925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+10050
-3925
lines changed

‎Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.fr-FR.resx‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,6 @@
300300
<data name="[RESX:EditControl].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
301301
<value>Contrôle de modification de contenu</value>
302302
</data>
303-
<data name="[RESX:EditorHeight].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
304-
<value>Hauteur</value>
305-
</data>
306-
<data name="[RESX:EditorMobile].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
307-
<value>Utilisateurs mobiles</value>
308-
</data>
309303
<data name="[RESX:EditorStyle].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
310304
<value>Style</value>
311305
</data>
@@ -315,9 +309,6 @@
315309
<data name="[RESX:EditorType].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
316310
<value>Éditeur</value>
317311
</data>
318-
<data name="[RESX:EditorWidth].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
319-
<value>Largeur</value>
320-
</data>
321312
<data name="[RESX:EditTimeLimit].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
322313
<value>Modifier l’intervalle</value>
323314
</data>
@@ -1540,4 +1531,22 @@ Votre méthode de suppression est actuellement définie sur {0}. Vos sujets ser
15401531
<data name="[RESX:Tips:SecGrid:ManageUsers].Text" xml:space="preserve">
15411532
<value>Peut gérer les options d’autres utilisateurs, bannir un utilisateur malveillant, supprimer tout le contenu de l’utilisateur et désactiver son compte d’utilisateur DNN. Ne peut pas être utilisé sur les super-utilisateurs ou les administrateurs. Ne doit être accordé qu’aux modérateurs de confiance ou aux rôles d’administrateur.</value>
15421533
</data>
1534+
<data name="[RESX:SecGrid:Mention].Text" xml:space="preserve">
1535+
<value>Mentionner</value>
1536+
</data>
1537+
<data name="[RESX:UserMentionVisibility].Text" xml:space="preserve">
1538+
<value>Visibilité des mentions utilisateur</value>
1539+
</data>
1540+
<data name="[RESX:RegisteredUsersPlusAdmins].Text" xml:space="preserve">
1541+
<value>Utilisateurs et administrateurs enregistrés mais pas Super Utilisateurs</value>
1542+
</data>
1543+
<data name="[RESX:Tips:SecGrid:Mention].Text" xml:space="preserve">
1544+
<value>Peut mentionner d’autres utilisateurs dans les posts (si la fonction du forum est activée)</value>
1545+
</data>
1546+
<data name="[RESX:Tips:UserMentions].Text" xml:space="preserve">
1547+
<value>Si activé, vous pouvez choisir quelle liste d’utilisateurs disponibles afficher lorsqu’un utilisateur commence à mentionner l’utilisation de @ dans un post</value>
1548+
</data>
1549+
<data name="[RESX:UserMentions].Text" xml:space="preserve">
1550+
<value>Mentions d’utilisateurs</value>
1551+
</data>
15431552
</root>

‎Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.it-IT.resx‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,6 @@
300300
<data name="[RESX:EditControl].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
301301
<value>Controllo di modifica del contenuto</value>
302302
</data>
303-
<data name="[RESX:EditorHeight].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
304-
<value>Altezza</value>
305-
</data>
306-
<data name="[RESX:EditorMobile].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
307-
<value>Utenti di dispositivi mobili</value>
308-
</data>
309303
<data name="[RESX:EditorStyle].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
310304
<value>Stile</value>
311305
</data>
@@ -315,9 +309,6 @@
315309
<data name="[RESX:EditorType].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
316310
<value>Editore</value>
317311
</data>
318-
<data name="[RESX:EditorWidth].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
319-
<value>Larghezza</value>
320-
</data>
321312
<data name="[RESX:EditTimeLimit].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
322313
<value>Intervallo di modifica</value>
323314
</data>
@@ -1537,4 +1528,22 @@ Il metodo di rimozione è attualmente impostato su {0}. I tuoi argomenti verran
15371528
<data name="[RESX:Tips:SecGrid:ManageUsers].Text" xml:space="preserve">
15381529
<value>Può gestire le opzioni di altri utenti, bandire un utente non autorizzato, eliminare tutti i contenuti per l'utente e disabilitare il suo account utente DNN. Non può essere utilizzato su utenti con privilegi avanzati o amministratori. Deve essere concesso solo ai moderatori attendibili o ai ruoli di amministratore.</value>
15391530
</data>
1531+
<data name="[RESX:SecGrid:Mention].Text" xml:space="preserve">
1532+
<value>Menzionare</value>
1533+
</data>
1534+
<data name="[RESX:UserMentionVisibility].Text" xml:space="preserve">
1535+
<value>Visibilità delle menzioni utente</value>
1536+
</data>
1537+
<data name="[RESX:RegisteredUsersPlusAdmins].Text" xml:space="preserve">
1538+
<value>Utenti registrati e amministratori ma non Super User</value>
1539+
</data>
1540+
<data name="[RESX:Tips:SecGrid:Mention].Text" xml:space="preserve">
1541+
<value>Può menzionare altri utenti nei post (se la funzione è abilitata per il forum)</value>
1542+
</data>
1543+
<data name="[RESX:Tips:UserMentions].Text" xml:space="preserve">
1544+
<value>Se abilitato, puoi scegliere quale elenco di utenti disponibili mostrare quando un utente inizia a menzionare @ in un post</value>
1545+
</data>
1546+
<data name="[RESX:UserMentions].Text" xml:space="preserve">
1547+
<value>Menzioni degli utenti</value>
1548+
</data>
15401549
</root>

‎Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.nl-NL.resx‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,6 @@
405405
<data name="[RESX:EditControl].Text" xml:space="preserve">
406406
<value>Content Wijzig Control</value>
407407
</data>
408-
<data name="[RESX:EditorHeight].Text" xml:space="preserve">
409-
<value>Hoogte</value>
410-
</data>
411-
<data name="[RESX:EditorMobile].Text" xml:space="preserve">
412-
<value>Mobiele gebruikers</value>
413-
</data>
414408
<data name="[RESX:EditorStyle].Text" xml:space="preserve">
415409
<value>Stijl</value>
416410
</data>
@@ -420,9 +414,6 @@
420414
<data name="[RESX:EditorType].Text" xml:space="preserve">
421415
<value>Editor</value>
422416
</data>
423-
<data name="[RESX:EditorWidth].Text" xml:space="preserve">
424-
<value>Breedte</value>
425-
</data>
426417
<data name="[RESX:EditTimeLimit].Text" xml:space="preserve">
427418
<value>Wijzig Interval</value>
428419
</data>
@@ -1687,4 +1678,22 @@ De verwijder-methode is momenteel ingesteld op "{0}". Uw onderwerpen worden {1}
16871678
<data name="[RESX:Tips:SecGrid:ManageUsers].Text" xml:space="preserve">
16881679
<value>Kan opties van andere gebruikers beheren, een malafide gebruiker verbannen, alle inhoud voor de gebruiker verwijderen en hun DNN-gebruikersaccount uitschakelen. Kan niet worden gebruikt voor supergebruikers of -beheerders. Mag alleen worden verleend aan vertrouwde moderators of beheerdersrollen.</value>
16891680
</data>
1681+
<data name="[RESX:SecGrid:Mention].Text" xml:space="preserve">
1682+
<value>Vermelden</value>
1683+
</data>
1684+
<data name="[RESX:UserMentionVisibility].Text" xml:space="preserve">
1685+
<value>Zichtbaarheid van gebruikersvermelding</value>
1686+
</data>
1687+
<data name="[RESX:RegisteredUsersPlusAdmins].Text" xml:space="preserve">
1688+
<value>Geregistreerde gebruikers en beheerders, maar geen supergebruikers</value>
1689+
</data>
1690+
<data name="[RESX:Tips:SecGrid:Mention].Text" xml:space="preserve">
1691+
<value>Kan andere gebruikers noemen in berichten (als functies ingeschakeld zijn voor het forum).</value>
1692+
</data>
1693+
<data name="[RESX:Tips:UserMentions].Text" xml:space="preserve">
1694+
<value>Als het ingeschakeld is, kun je kiezen welke lijst van beschikbare gebruikers je toont wanneer een gebruiker begint te vermelden dat je @ gebruikt in een bericht</value>
1695+
</data>
1696+
<data name="[RESX:UserMentions].Text" xml:space="preserve">
1697+
<value>Gebruikersvermeldingen</value>
1698+
</data>
16901699
</root>

‎Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.resx‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,6 @@
195195
<data name="[RESX:Disabled].Text" xml:space="preserve">
196196
<value>Off</value>
197197
</data>
198-
<data name="[RESX:EditorHeight].Text" xml:space="preserve">
199-
<value>Height</value>
200-
</data>
201198
<data name="[RESX:EditorStyle].Text" xml:space="preserve">
202199
<value>Style</value>
203200
</data>
@@ -207,12 +204,6 @@
207204
<data name="[RESX:EditorType].Text" xml:space="preserve">
208205
<value>Editor</value>
209206
</data>
210-
<data name="[RESX:EditorWidth].Text" xml:space="preserve">
211-
<value>Width</value>
212-
</data>
213-
<data name="[RESX:EditorMobile].Text" xml:space="preserve">
214-
<value>Mobile users</value>
215-
</data>
216207
<data name="[RESX:EmailAddress].Text" xml:space="preserve">
217208
<value>Email Address</value>
218209
</data>
@@ -1642,4 +1633,22 @@ Your removal method is currently set to {0}. Your topics will be {1} based upon
16421633
<data name="[RESX:BadgeIntervalDays].Text" xml:space="preserve">
16431634
<value># of days between earning this badge</value>
16441635
</data>
1636+
<data name="[RESX:Tips:SecGrid:Mention].Text" xml:space="preserve">
1637+
<value>Can mention other users in posts (if feature enabled for forum)</value>
1638+
</data>
1639+
<data name="[RESX:SecGrid:Mention].Text" xml:space="preserve">
1640+
<value>Mention</value>
1641+
</data>
1642+
<data name="[RESX:Tips:UserMentions].Text" xml:space="preserve">
1643+
<value>If enabled, you can choose which list of available users to display when a user starts to mention using @ in a post</value>
1644+
</data>
1645+
<data name="[RESX:UserMentionVisibility].Text" xml:space="preserve">
1646+
<value>User Mention Visibility</value>
1647+
</data>
1648+
<data name="[RESX:RegisteredUsersPlusAdmins].Text" xml:space="preserve">
1649+
<value>Registered Users and Administrators but not Super Users</value>
1650+
</data>
1651+
<data name="[RESX:UserMentions].Text" xml:space="preserve">
1652+
<value>User Mentions</value>
1653+
</data>
16451654
</root>

‎Dnn.CommunityForums/App_LocalResources/Controlpanel.ascx.de-DE.resx‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,6 @@
405405
<data name="[RESX:EditControl].Text" xml:space="preserve">
406406
<value>Kontrolle über die Bearbeitung von Inhalten</value>
407407
</data>
408-
<data name="[RESX:EditorHeight].Text" xml:space="preserve">
409-
<value>Höhe</value>
410-
</data>
411-
<data name="[RESX:EditorMobile].Text" xml:space="preserve">
412-
<value>Mobile Benutzer</value>
413-
</data>
414408
<data name="[RESX:EditorStyle].Text" xml:space="preserve">
415409
<value>Stil</value>
416410
</data>
@@ -420,9 +414,6 @@
420414
<data name="[RESX:EditorType].Text" xml:space="preserve">
421415
<value>Texteditor</value>
422416
</data>
423-
<data name="[RESX:EditorWidth].Text" xml:space="preserve">
424-
<value>Breite</value>
425-
</data>
426417
<data name="[RESX:EditTimeLimit].Text" xml:space="preserve">
427418
<value>Bearbeitungsintervall</value>
428419
</data>
@@ -1642,4 +1633,22 @@ Ihre Entfernungsmethode ist derzeit auf {0} eingestellt. Ihre Themen werden anh
16421633
<data name="[RESX:Tips:SecGrid:ManageUsers].Text" xml:space="preserve">
16431634
<value>Kann Optionen anderer Benutzer verwalten, einen nicht autorisierten Benutzer verbannen, alle Inhalte für den Benutzer löschen und sein DNN-Benutzerkonto deaktivieren. Kann nicht für Superuser oder Administratoren verwendet werden. Sollte nur vertrauenswürdigen Moderatoren oder Administratorrollen gewährt werden.</value>
16441635
</data>
1636+
<data name="[RESX:SecGrid:Mention].Text" xml:space="preserve">
1637+
<value>Erwähnen</value>
1638+
</data>
1639+
<data name="[RESX:UserMentionVisibility].Text" xml:space="preserve">
1640+
<value>Benutzer-Erwähnungssichtbarkeit</value>
1641+
</data>
1642+
<data name="[RESX:RegisteredUsersPlusAdmins].Text" xml:space="preserve">
1643+
<value>Registrierte Benutzer und Administratoren, aber keine Supernutzer</value>
1644+
</data>
1645+
<data name="[RESX:Tips:SecGrid:Mention].Text" xml:space="preserve">
1646+
<value>Kann andere Nutzer in Beiträgen erwähnen (sofern Funktion im Forum aktiviert ist).</value>
1647+
</data>
1648+
<data name="[RESX:Tips:UserMentions].Text" xml:space="preserve">
1649+
<value>Wenn aktiviert, kannst du auswählen, welche Liste verfügbarer Nutzer angezeigt werden soll, wenn ein Nutzer beginnt, @ in einem Beitrag zu erwähnen.</value>
1650+
</data>
1651+
<data name="[RESX:UserMentions].Text" xml:space="preserve">
1652+
<value>Benutzerhinweise</value>
1653+
</data>
16451654
</root>

‎Dnn.CommunityForums/App_LocalResources/Controlpanel.ascx.es-ES.resx‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,6 @@
300300
<data name="[RESX:EditControl].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
301301
<value>Control de edición de contenido</value>
302302
</data>
303-
<data name="[RESX:EditorHeight].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
304-
<value>Alto</value>
305-
</data>
306-
<data name="[RESX:EditorMobile].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
307-
<value>Usuarios de dispositivos móviles</value>
308-
</data>
309303
<data name="[RESX:EditorStyle].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
310304
<value>Estilo</value>
311305
</data>
@@ -315,9 +309,6 @@
315309
<data name="[RESX:EditorType].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
316310
<value>Editor</value>
317311
</data>
318-
<data name="[RESX:EditorWidth].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
319-
<value>Ancho</value>
320-
</data>
321312
<data name="[RESX:EditTimeLimit].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
322313
<value>Intervalo de edición</value>
323314
</data>
@@ -1537,4 +1528,22 @@ El método de eliminación está configurado actualmente en {0}. Los temas se {
15371528
<data name="[RESX:Tips:SecGrid:ManageUsers].Text" xml:space="preserve">
15381529
<value>Puede administrar las opciones de otros usuarios, desterrar a un usuario deshonesto, eliminar todo el contenido del usuario y deshabilitar su cuenta de usuario DNN. No se puede utilizar en superusuarios ni administradores. Solo se debe conceder a moderadores de confianza o roles de administrador.</value>
15391530
</data>
1531+
<data name="[RESX:SecGrid:Mention].Text" xml:space="preserve">
1532+
<value>Mención</value>
1533+
</data>
1534+
<data name="[RESX:UserMentionVisibility].Text" xml:space="preserve">
1535+
<value>Visibilidad de las menciones de usuario</value>
1536+
</data>
1537+
<data name="[RESX:RegisteredUsersPlusAdmins].Text" xml:space="preserve">
1538+
<value>Usuarios y administradores registrados, pero no superusuarios</value>
1539+
</data>
1540+
<data name="[RESX:Tips:SecGrid:Mention].Text" xml:space="preserve">
1541+
<value>Puede mencionar a otros usuarios en las publicaciones (si la función está activada para el foro)</value>
1542+
</data>
1543+
<data name="[RESX:Tips:UserMentions].Text" xml:space="preserve">
1544+
<value>Si está activado, puedes elegir qué lista de usuarios disponibles mostrar cuando un usuario empiece a mencionar usar @ en una publicación</value>
1545+
</data>
1546+
<data name="[RESX:UserMentions].Text" xml:space="preserve">
1547+
<value>Menciones de usuarios</value>
1548+
</data>
15401549
</root>

‎Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.de-DE.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,4 +507,7 @@
507507
<data name="AvatarRefreshType.Help" xml:space="preserve">
508508
<value>Aktualisiert Avatare regelmäßig mit dem ausgewählten Dienst</value>
509509
</data>
510+
<data name="[RESX:SecGrid:mention].Text" xml:space="preserve">
511+
<value>Erwähnen</value>
512+
</data>
510513
</root>

‎Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.es-ES.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,4 +402,7 @@
402402
<data name="AvatarRefreshType.Help" xml:space="preserve">
403403
<value>Actualiza periódicamente los avatares utilizando el servicio seleccionado</value>
404404
</data>
405+
<data name="[RESX:SecGrid:mention].Text" xml:space="preserve">
406+
<value>Mención</value>
407+
</data>
405408
</root>

‎Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.fr-FR.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,4 +402,7 @@
402402
<data name="AvatarRefreshType.Help" xml:space="preserve">
403403
<value>Actualise périodiquement les avatars à l’aide du service sélectionné</value>
404404
</data>
405+
<data name="[RESX:SecGrid:mention].Text" xml:space="preserve">
406+
<value>Mentionner</value>
407+
</data>
405408
</root>

‎Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.it-IT.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,4 +402,7 @@
402402
<data name="[RESX:SecGrid:manageusers].Text" xml:space="preserve">
403403
<value>Gestisci utenti</value>
404404
</data>
405+
<data name="[RESX:SecGrid:mention].Text" xml:space="preserve">
406+
<value>Menzionare</value>
407+
</data>
405408
</root>

0 commit comments

Comments
 (0)