Merge branch 'main' of https://git.azuze.fr/kawa/Sharepoint-Toolbox

2026-04-24 10:50:19 +02:00
parent 12dd1de9f2 f4cc81bb71
commit b8c09655ac
14 changed files with 523 additions and 0 deletions
@@ -44,7 +44,11 @@
        </GroupBox.Style>
        <StackPanel>
          <TextBox Text="{Binding SearchQuery, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,0,2" />
+<<<<<<< HEAD
          <TextBlock Text="{Binding Source={x:Static loc:TranslationSource.Instance}, Path=[audit.searching]}" FontStyle="Italic" FontSize="10" Foreground="{DynamicResource TextMutedBrush}" Margin="0,0,0,2">
+=======
+          <TextBlock Text="Searching..." FontStyle="Italic" FontSize="10" Foreground="{DynamicResource TextMutedBrush}" Margin="0,0,0,2">
+>>>>>>> f4cc81bb71b935c6f6f050288c9e283dcca5cfa8
            <TextBlock.Style>
              <Style TargetType="TextBlock">
                <Setter Property="Visibility" Value="Collapsed" />