Skip to content

Commit e949022

Browse files
yaira2yaira2
authored
Merge branch 'main' into ya/ArchiveMediaPreview
2 parents 868b5b0 + 00543d8 commit e949022

Some content is hidden

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

46 files changed

+3791
-20
lines changed

‎src/Files.App (Package)/Files.Package.wapproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<DisableXbfLineInfo>False</DisableXbfLineInfo>
1515
<GenerateTestArtifacts>True</GenerateTestArtifacts>
1616
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
17-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lt;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
17+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lt;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
1818
<UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
1919
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
2020
<EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>

‎src/Files.App (Package)/Package.appxmanifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<Resource Language="en-GB" />
4444
<Resource Language="es-ES" />
4545
<Resource Language="es-419" />
46+
<Resource Language="fa-IR" />
4647
<Resource Language="fi-FI" />
4748
<Resource Language="fil-PH" />
4849
<Resource Language="fr-FR" />

‎src/Files.App/Files.App.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AssemblyName>Files</AssemblyName>
88
<DefaultLanguage>en-US</DefaultLanguage>
99
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
10-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lt;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
10+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lt;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
1111
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
1212
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
1313
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>

‎src/Files.App/ResourceDictionaries/PathIcons.xaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2628,6 +2628,35 @@
26282628
</Setter>
26292629
</Style>
26302630

2631+
<Style x:Key="ColorIconCloudKeepOffline" TargetType="local:OpacityIcon">
2632+
<Setter Property="Template">
2633+
<Setter.Value>
2634+
<ControlTemplate>
2635+
<Viewbox Stretch="Fill">
2636+
<Grid Width="16" Height="16">
2637+
<Path
2638+
x:Name="Path1"
2639+
Data="M2.66782 6.1263C2.87421 5.94284 3.19025 5.96143 3.37371 6.16782L6.02141 9.27148L13.1465 2.14645C13.3417 1.95118 13.6583 1.95118 13.8536 2.14645C14.0488 2.34171 14.0488 2.65829 13.8536 2.85355L6.35356 10.3536C6.15013 10.557 5.81743 10.5472 5.6263 10.3322L2.6263 6.83218C2.44284 6.62579 2.46143 6.30975 2.66782 6.1263Z"
2640+
Fill="{ThemeResource SystemFillColorSuccessBrush}" />
2641+
<Path
2642+
x:Name="Path2"
2643+
Data="M2.5 11C2.22386 11 2 11.2239 2 11.5V13.5C2 13.7761 2.22386 14 2.5 14H13.5C13.7761 14 14 13.7761 14 13.5V11.5C14 11.2239 13.7761 11 13.5 11C13.2239 11 13 11.2239 13 11.5V13H3V11.5C3 11.2239 2.77614 11 2.5 11Z"
2644+
Fill="{ThemeResource SystemFillColorSuccessBrush}" />
2645+
</Grid>
2646+
2647+
<VisualStateManager.VisualStateGroups>
2648+
<VisualStateGroup>
2649+
<VisualState x:Name="Normal" />
2650+
<VisualState x:Name="Disabled" />
2651+
<VisualState x:Name="Selected" />
2652+
</VisualStateGroup>
2653+
</VisualStateManager.VisualStateGroups>
2654+
</Viewbox>
2655+
</ControlTemplate>
2656+
</Setter.Value>
2657+
</Setter>
2658+
</Style>
2659+
26312660
<Style x:Key="ColorIconGitAdded" TargetType="local:OpacityIcon">
26322661
<Setter Property="Template">
26332662
<Setter.Value>

‎src/Files.App/Strings/af/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,6 +2341,9 @@
23412341
<data name="CalculationError" xml:space="preserve">
23422342
<value>An error occurred during the calculation</value>
23432343
</data>
2344+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2345+
<value>Failed to calculate the hash, please close the file and try again.</value>
2346+
</data>
23442347
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23452348
<value>Hashes aren't available for online files</value>
23462349
</data>

‎src/Files.App/Strings/ar/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>حدث خطأ أثناء الحساب</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Failed to calculate the hash, please close the file and try again.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Hashes aren't available for online files</value>
23452348
</data>

‎src/Files.App/Strings/bg/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>Възникна грешка, изчислявайки</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Failed to calculate the hash, please close the file and try again.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Hashes aren't available for online files</value>
23452348
</data>

‎src/Files.App/Strings/ca/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>An error occurred during the calculation</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Failed to calculate the hash, please close the file and try again.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Hashes aren't available for online files</value>
23452348
</data>

‎src/Files.App/Strings/cs-CZ/Resources.resw

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>Během výpočtu došlo k chybě</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Failed to calculate the hash, please close the file and try again.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Hashy nejsou k dispozici pro online soubory</value>
23452348
</data>
@@ -3603,7 +3606,7 @@
36033606
<value>Žádné probíhající operace se soubory</value>
36043607
</data>
36053608
<data name="OpenOnStartupDisabled" xml:space="preserve">
3606-
<value>The option to open Files on Windows Startup is not available due to your system settings or group policy. To re-enable, open the startup page in Task Manager.</value>
3609+
<value>Možnost otevřít Files při spuštění systému Windows není dostupná kvůli nastavení systému nebo skupinovým pravidlům. Chcete-li ji umožnit, otevřete úvodní stránku ve Správci úloh.</value>
36073610
</data>
36083611
<data name="FailedToRestore" xml:space="preserve">
36093612
<value>Obnovení položek z koše se nezdařilo</value>

‎src/Files.App/Strings/da/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>Der opstod en fejl under beregningen</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Failed to calculate the hash, please close the file and try again.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Hashes aren't available for online files</value>
23452348
</data>

‎src/Files.App/Strings/de-DE/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>Während der Berechnung ist ein Fehler aufgetreten</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Fehler beim Berechnen des Hashs, bitte schließen Sie die Datei und versuchen Sie es erneut.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Hashes sind für Online-Dateien nicht verfügbar</value>
23452348
</data>

‎src/Files.App/Strings/el/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>Παρουσιάστηκε σφάλμα κατά τον υπολογισμό</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Failed to calculate the hash, please close the file and try again.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Hashes aren't available for online files</value>
23452348
</data>

‎src/Files.App/Strings/en-GB/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>An error occurred during the calculation</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Failed to calculate the hash, please close the file and try again.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Hashes aren't available for online files</value>
23452348
</data>

‎src/Files.App/Strings/es-419/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>Se ha producido un error en el cálculo</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Failed to calculate the hash, please close the file and try again.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Los hash no están disponibles para los archivos en línea</value>
23452348
</data>

‎src/Files.App/Strings/es-ES/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,9 @@
23402340
<data name="CalculationError" xml:space="preserve">
23412341
<value>Se ha producido un error en el cálculo</value>
23422342
</data>
2343+
<data name="CalculationErrorFileIsOpen" xml:space="preserve">
2344+
<value>Failed to calculate the hash, please close the file and try again.</value>
2345+
</data>
23432346
<data name="CalculationOnlineFileHashError" xml:space="preserve">
23442347
<value>Los códigos 'hash' no están disponibles para archivos en línea</value>
23452348
</data>

0 commit comments

Comments
 (0)