Skip to content

Commit 15d5b71

Browse files
johnhenleyjohnhenley
authored
Merge pull request #1583 from DNNCommunity/dev
TASK: Merge dev to master
2 parents 3865e1d + 0e3d756 commit 15d5b71

File tree

416 files changed

+68026
-3195
lines changed

Some content is hidden

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

416 files changed

+68026
-3195
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@
153153
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
154154
<value>Niveau de confiance automatique</value>
155155
</data>
156-
<data name="[RESX:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
157-
<value>Avatar par défaut activé</value>
158-
</data>
159156
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
160157
<value>Dimensions de l’avatar</value>
161158
</data>
@@ -919,10 +916,7 @@ Votre méthode de suppression est actuellement définie sur {0}. Vos sujets ser
919916
<data name="[RESX:System].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
920917
<value>Système</value>
921918
</data>
922-
<data name="[RESX:TagClicks].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
923-
<value>Clics</value>
924-
</data>
925-
<data name="[RESX:TagItems].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
919+
<data name="[RESX:Items].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
926920
<value>Articles</value>
927921
</data>
928922
<data name="[RESX:TagName].Text" xml:space="preserve" lastModified="2024-06-09 21:35:39">
@@ -979,9 +973,6 @@ Votre méthode de suppression est actuellement définie sur {0}. Vos sujets ser
979973
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve" lastModified="2024-06-09 21:35:39">
980974
<value>Sélectionnez les rôles qui seront automatiquement souscrits et recevrez des notifications par courriel pour tout nouveau contenu publié sur ce forum.</value>
981975
</data>
982-
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
983-
<value>Activez cette option pour afficher l’avatar par défaut à partir du répertoire themes lorsqu’un utilisateur n’a pas encore spécifié d’avatar.</value>
984-
</data>
985976
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
986977
<value> Choisissez la hauteur et la largeur maximales des avatars</value>
987978
</data>

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@
153153
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
154154
<value>Livello di attendibilità automatica</value>
155155
</data>
156-
<data name="[RESX:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
157-
<value>Avatar predefinito abilitato</value>
158-
</data>
159156
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
160157
<value>Dimensioni dell'avatar</value>
161158
</data>
@@ -916,10 +913,7 @@ Il metodo di rimozione è attualmente impostato su {0}. I tuoi argomenti verran
916913
<data name="[RESX:System].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
917914
<value>Sistema</value>
918915
</data>
919-
<data name="[RESX:TagClicks].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
920-
<value>Clic</value>
921-
</data>
922-
<data name="[RESX:TagItems].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
916+
<data name="[RESX:Items].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
923917
<value>Elementi</value>
924918
</data>
925919
<data name="[RESX:TagName].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
@@ -976,9 +970,6 @@ Il metodo di rimozione è attualmente impostato su {0}. I tuoi argomenti verran
976970
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
977971
<value>Seleziona i ruoli che verranno iscritti automaticamente e riceverai notifiche via e-mail per i nuovi contenuti pubblicati su questo forum.</value>
978972
</data>
979-
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
980-
<value>Attivare questa opzione per visualizzare l'avatar predefinito dalla directory dei temi quando un utente non ha ancora specificato un avatar.</value>
981-
</data>
982973
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
983974
<value> Scegli l'altezza e la larghezza massime per gli avatar</value>
984975
</data>

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,6 @@
258258
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve">
259259
<value>Auto Niveau Vertrouwen</value>
260260
</data>
261-
<data name="[RESX:AvatarDefault].Text" xml:space="preserve">
262-
<value>Standaard Avatar Ingeschakeld</value>
263-
</data>
264261
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve">
265262
<value>Avatar Dimensies</value>
266263
</data>
@@ -1066,10 +1063,7 @@ De verwijder-methode is momenteel ingesteld op "{0}". Uw onderwerpen worden {1}
10661063
<data name="[RESX:System].Text" xml:space="preserve">
10671064
<value>Systeem</value>
10681065
</data>
1069-
<data name="[RESX:TagClicks].Text" xml:space="preserve">
1070-
<value>Kliks</value>
1071-
</data>
1072-
<data name="[RESX:TagItems].Text" xml:space="preserve">
1066+
<data name="[RESX:Items].Text" xml:space="preserve">
10731067
<value>Items</value>
10741068
</data>
10751069
<data name="[RESX:TagName].Text" xml:space="preserve">
@@ -1126,9 +1120,6 @@ De verwijder-methode is momenteel ingesteld op "{0}". Uw onderwerpen worden {1}
11261120
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve">
11271121
<value>Selecteer de rollen welke automatisch zijn geabonneerd en welke notificatie berichten ontvangen wanneer nieuwe berichten in dit forum worden geplaatst.</value>
11281122
</data>
1129-
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve">
1130-
<value>Schakel deze optie in om de standaard avatar vanuit de thema directory weer te geven indien een gebruiker geen avatar heeft gespecificeerd.</value>
1131-
</data>
11321123
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve">
11331124
<value> Kies de maximum hoogte en breedte voor de avatars</value>
11341125
</data>

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -777,10 +777,7 @@
777777
<data name="[RESX:RestoreDefaults].Text" xml:space="preserve">
778778
<value>Load Default Filters</value>
779779
</data>
780-
<data name="[RESX:TagClicks].Text" xml:space="preserve">
781-
<value>Clicks</value>
782-
</data>
783-
<data name="[RESX:TagItems].Text" xml:space="preserve">
780+
<data name="[RESX:Items].Text" xml:space="preserve">
784781
<value>Items</value>
785782
</data>
786783
<data name="[RESX:TagName].Text" xml:space="preserve">
@@ -1077,12 +1074,6 @@
10771074
<data name="[RESX:UserNameNotFound].Text" xml:space="preserve">
10781075
<value>The username you entered was not found.</value>
10791076
</data>
1080-
<data name="[RESX:AvatarDefault].Text" xml:space="preserve">
1081-
<value>Default Avatar Enabled</value>
1082-
</data>
1083-
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve">
1084-
<value>Enable this option to display the default avatar from the themes directory when a user has not yet specified an avatar.</value>
1085-
</data>
10861077
<data name="[RESX:MoveDown].Text" xml:space="preserve">
10871078
<value>Move Down</value>
10881079
</data>

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,6 @@
258258
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve">
259259
<value>Automatische Vertrauensstufe</value>
260260
</data>
261-
<data name="[RESX:AvatarDefault].Text" xml:space="preserve">
262-
<value>Standard-Avatar aktiviert</value>
263-
</data>
264261
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve">
265262
<value>Avatar-Abmessungen</value>
266263
</data>
@@ -1021,10 +1018,7 @@ Ihre Entfernungsmethode ist derzeit auf {0} eingestellt. Ihre Themen werden anh
10211018
<data name="[RESX:System].Text" xml:space="preserve">
10221019
<value>System</value>
10231020
</data>
1024-
<data name="[RESX:TagClicks].Text" xml:space="preserve">
1025-
<value>Klicks</value>
1026-
</data>
1027-
<data name="[RESX:TagItems].Text" xml:space="preserve">
1021+
<data name="[RESX:Items].Text" xml:space="preserve">
10281022
<value>Elemente</value>
10291023
</data>
10301024
<data name="[RESX:TagName].Text" xml:space="preserve">
@@ -1081,9 +1075,6 @@ Ihre Entfernungsmethode ist derzeit auf {0} eingestellt. Ihre Themen werden anh
10811075
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve">
10821076
<value>Wählen Sie Rollen aus, die automatisch abonniert werden, und erhalten Sie E-Mail-Benachrichtigungen für neue Inhalte, die in diesem Forum veröffentlicht werden.</value>
10831077
</data>
1084-
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve">
1085-
<value>Aktivieren Sie diese Option, um den Standard-Avatar aus dem Themenverzeichnis anzuzeigen, wenn ein Benutzer noch keinen Avatar angegeben hat.</value>
1086-
</data>
10871078
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve">
10881079
<value> Wählen Sie die maximale Höhe und Breite für Avatare</value>
10891080
</data>

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@
153153
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
154154
<value>Nivel de confianza automática</value>
155155
</data>
156-
<data name="[RESX:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
157-
<value>Avatar predeterminado habilitado</value>
158-
</data>
159156
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
160157
<value>Dimensiones del avatar</value>
161158
</data>
@@ -916,10 +913,7 @@ El método de eliminación está configurado actualmente en {0}. Los temas se {
916913
<data name="[RESX:System].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
917914
<value>Sistema</value>
918915
</data>
919-
<data name="[RESX:TagClicks].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
920-
<value>Clics</value>
921-
</data>
922-
<data name="[RESX:TagItems].Text" xml:space="preserve" lastModified="2024-05-27 10:53:02">
916+
<data name="[RESX:Items].Text" xml:space="preserve" lastModified="2024-05-27 10:53:02">
923917
<value>Elementos</value>
924918
</data>
925919
<data name="[RESX:TagName].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
@@ -976,9 +970,6 @@ El método de eliminación está configurado actualmente en {0}. Los temas se {
976970
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve" lastModified="2024-05-27 10:56:14">
977971
<value>Seleccione los roles que se suscribirán automáticamente y recibirán notificaciones por correo para el nuevo contenido publicado en este foro.</value>
978972
</data>
979-
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
980-
<value>Habilite esta opción para mostrar el avatar predeterminado del directorio de temas cuando un usuario aún no haya especificado un avatar.</value>
981-
</data>
982973
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
983974
<value>Seleccione el alto y ancho máximos de los avatares</value>
984975
</data>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,4 +495,10 @@
495495
<data name="URLPrefixLikes.Help" xml:space="preserve">
496496
<value>Dies ist der Text, der als Teil der URL verwendet wird, um Likes im Forum zu identifizieren.</value>
497497
</data>
498+
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
499+
<value>Deaktiviert</value>
500+
</data>
501+
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
502+
<value>Gravatar</value>
503+
</data>
498504
</root>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,4 +390,10 @@
390390
<data name="URLPrefixLikes.Help" xml:space="preserve">
391391
<value>Este es el texto que se utilizará como parte de la URL para identificar los Me gusta del foro.</value>
392392
</data>
393+
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
394+
<value>Deshabilitado</value>
395+
</data>
396+
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
397+
<value>Gravatar</value>
398+
</data>
393399
</root>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,4 +390,10 @@
390390
<data name="URLPrefixLikes.Help" xml:space="preserve">
391391
<value>Il s’agit du texte qui sera utilisé dans le cadre de l’URL pour identifier les likes du forum.</value>
392392
</data>
393+
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
394+
<value>Désactivé</value>
395+
</data>
396+
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
397+
<value>Gravatar</value>
398+
</data>
393399
</root>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,4 +390,16 @@
390390
<data name="URLPrefixLikes.Help" xml:space="preserve">
391391
<value>Questo è il testo che verrà utilizzato come parte dell'URL per identificare i Mi piace del forum.</value>
392392
</data>
393+
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
394+
<value>Gravatar</value>
395+
</data>
396+
<data name="AvatarRefreshType.Text" xml:space="preserve">
397+
<value>Aggiorna avatar</value>
398+
</data>
399+
<data name="AvatarRefreshType.Help" xml:space="preserve">
400+
<value>Aggiorna periodicamente gli avatar utilizzando il servizio selezionato</value>
401+
</data>
402+
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
403+
<value>Disabile</value>
404+
</data>
393405
</root>

0 commit comments

Comments
 (0)