mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Tobias Kaminsky 2023-10-13 03:35:15 +02:00
commit 9a572e5dc7
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt
View file

@ -151,7 +151,7 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
false, false,
context, context,
binding.thumbnailLayout.thumbnailShimmer, binding.thumbnailLayout.thumbnailShimmer,
null, syncedFolderProvider.preferences,
viewThemeUtils, viewThemeUtils,
syncedFolderProvider syncedFolderProvider
) )

2
app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
View file

@ -213,7 +213,7 @@ public class ConflictsResolveDialog extends DialogFragment implements Injectable
false, false,
getContext(), getContext(),
null, null,
null, syncedFolderProvider.getPreferences(),
viewThemeUtils, viewThemeUtils,
syncedFolderProvider); syncedFolderProvider);

2
app/src/main/res/values-sk-rSK/strings.xml
View file

@ -640,7 +640,7 @@
<string name="select_template">Vybrať šablónu</string> <string name="select_template">Vybrať šablónu</string>
<string name="send">Odoslať</string> <string name="send">Odoslať</string>
<string name="send_note">Odoslať poznámku pre príjemcu</string> <string name="send_note">Odoslať poznámku pre príjemcu</string>
<string name="send_share">Odoslať Zdieľanie</string> <string name="send_share">Odoslať zdieľanie</string>
<string name="sendbutton_description">Ikona tlačidla na odoslanie</string> <string name="sendbutton_description">Ikona tlačidla na odoslanie</string>
<string name="set_as">Nastaviť ako</string> <string name="set_as">Nastaviť ako</string>
<string name="set_note">Nastaviť poznámku</string> <string name="set_note">Nastaviť poznámku</string>