Skip to content

Commit aaca29b

Browse files
skjnldsvskjnldsv
authored
Merge pull request #54202 from nextcloud/fix/less-words
2 parents b4302fe + 98d3709 commit aaca29b

File tree

60 files changed

+118
-118
lines changed

Some content is hidden

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

60 files changed

+118
-118
lines changed

‎apps/federatedfilesharing/src/components/PersonalSettings.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,14 @@ export default {
156156
</a>`
157157
},
158158
copyLinkTooltip() {
159-
return this.isCopied ? t('federatedfilesharing', 'Cloud ID copied to the clipboard') : t('federatedfilesharing', 'Copy to clipboard')
159+
return this.isCopied ? t('federatedfilesharing', 'Cloud ID copied') : t('federatedfilesharing', 'Copy')
160160
},
161161
},
162162
methods: {
163163
async copyCloudId(): Promise<void> {
164164
try {
165165
await navigator.clipboard.writeText(this.cloudId)
166-
showSuccess(t('federatedfilesharing', 'Cloud ID copied to the clipboard'))
166+
showSuccess(t('federatedfilesharing', 'Cloud ID copied'))
167167
} catch (e) {
168168
// no secure context or really old browser - need a fallback
169169
window.prompt(t('federatedfilesharing', 'Clipboard not available. Please copy the cloud ID manually.'), this.reference)

‎apps/files/src/actions/sidebarAction.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('Open sidebar action conditions tests', () => {
1717
test('Default values', () => {
1818
expect(action).toBeInstanceOf(FileAction)
1919
expect(action.id).toBe('details')
20-
expect(action.displayName([], view)).toBe('Open details')
20+
expect(action.displayName([], view)).toBe('Details')
2121
expect(action.iconSvgInline([], view)).toMatch(/<svg.+<\/svg>/)
2222
expect(action.default).toBeUndefined()
2323
expect(action.order).toBe(-50)

‎apps/files/src/actions/sidebarAction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const ACTION_DETAILS = 'details'
1616

1717
export const action = new FileAction({
1818
id: ACTION_DETAILS,
19-
displayName: () => t('files', 'Open details'),
19+
displayName: () => t('files', 'Details'),
2020
iconSvgInline: () => InformationSvg,
2121

2222
// Sidebar currently supports user folder only, /files/USER

‎apps/files/src/components/FilesListTableHeaderActions.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,16 +305,16 @@ export default defineComponent({
305305
return
306306
}
307307
308-
showError(this.t('files', '"{displayName}" failed on some elements', { displayName }))
308+
showError(this.t('files', '{displayName}: failed on some elements', { displayName }))
309309
return
310310
}
311311
312312
// Show success message and clear selection
313-
showSuccess(this.t('files', '"{displayName}" batch action executed successfully', { displayName }))
313+
showSuccess(this.t('files', '{displayName}: done', { displayName }))
314314
this.selectionStore.reset()
315315
} catch (e) {
316316
logger.error('Error while executing action', { action, e })
317-
showError(this.t('files', '"{displayName}" action failed', { displayName }))
317+
showError(this.t('files', '{displayName}: failed', { displayName }))
318318
} finally {
319319
// Remove loading markers
320320
this.loading = null

‎apps/files/src/components/FilesNavigationSearch.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ const isSearchView = computed(() => currentView.value.id === VIEW_ID)
5555
*/
5656
const searchLabel = computed(() => {
5757
if (searchStore.scope === 'globally') {
58-
return t('files', 'Search globally by filename …')
58+
return t('files', 'Search everywhere …')
5959
}
60-
return t('files', 'Search here by filename …')
60+
return t('files', 'Search here …')
6161
})
6262
</script>
6363

@@ -72,13 +72,13 @@ const searchLabel = computed(() => {
7272
<template #icon>
7373
<NcIconSvgWrapper :path="mdiMagnify" />
7474
</template>
75-
{{ t('files', 'Filter and search from this location') }}
75+
{{ t('files', 'Search here') }}
7676
</NcActionButton>
7777
<NcActionButton close-after-click @click="searchStore.scope = 'globally'">
7878
<template #icon>
7979
<NcIconSvgWrapper :path="mdiSearchWeb" />
8080
</template>
81-
{{ t('files', 'Search globally') }}
81+
{{ t('files', 'Search everywhere') }}
8282
</NcActionButton>
8383
</NcActions>
8484
</template>

‎apps/files/src/filters/TypeFilter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ const getTypePresets = async () => [
7373
{
7474
id: 'image',
7575
// TRANSLATORS: This is for filtering files, e.g. PNG or JPEG, so photos, drawings, or images in general
76-
label: t('files', 'Photos and images'),
76+
label: t('files', 'Images'),
7777
icon: svgImage,
7878
mime: ['image'],
7979
},

‎apps/files/src/utils/actionUtils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ export const executeAction = async (action: FileAction) => {
5959
}
6060

6161
if (success) {
62-
showSuccess(t('files', '"{displayName}" action executed successfully', { displayName }))
62+
showSuccess(t('files', '{displayName}: done', { displayName }))
6363
return
6464
}
65-
showError(t('files', '"{displayName}" action failed', { displayName }))
65+
showError(t('files', '{displayName}: failed', { displayName }))
6666
} catch (error) {
6767
logger.error('Error while executing action', { action, error })
68-
showError(t('files', '"{displayName}" action failed', { displayName }))
68+
showError(t('files', '{displayName}: failed', { displayName }))
6969
} finally {
7070
// Reset the loading marker
7171
Vue.set(currentNode, 'status', undefined)

‎apps/files/src/utils/davUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export function humanizeWebDAVError(error: unknown) {
2929
} else if (status === 403) {
3030
return t('files', 'This operation is forbidden')
3131
} else if (status === 500) {
32-
return t('files', 'This directory is unavailable, please check the logs or contact the administrator')
32+
return t('files', 'This folder is unavailable, please try again later or contact the administration')
3333
} else if (status === 503) {
3434
return t('files', 'Storage is temporarily not available')
3535
}

‎apps/files/src/views/FilesList.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -816,13 +816,13 @@ export default defineComponent({
816816
}
817817
818818
if (success) {
819-
showSuccess(t('files', '"{displayName}" action executed successfully', { displayName }))
819+
showSuccess(t('files', '{displayName}: done', { displayName }))
820820
return
821821
}
822-
showError(t('files', '"{displayName}" action failed', { displayName }))
822+
showError(t('files', '{displayName}: failed', { displayName }))
823823
} catch (error) {
824824
logger.error('Error while executing action', { action, error })
825-
showError(t('files', '"{displayName}" action failed', { displayName }))
825+
showError(t('files', '{displayName}: failed', { displayName }))
826826
} finally {
827827
this.loadingAction = null
828828
}

‎apps/files/src/views/Settings.vue‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
:name="t('files', 'Files settings')"
99
@update:open="onClose">
1010
<!-- Settings API-->
11-
<NcAppSettingsSection id="settings" :name="t('files', 'Files settings')">
11+
<NcAppSettingsSection id="settings" :name="t('files', 'General')">
1212
<fieldset class="files-settings__default-view"
1313
data-cy-files-settings-setting="default_view">
1414
<legend>
@@ -42,12 +42,12 @@
4242
<NcCheckboxRadioSwitch data-cy-files-settings-setting="folder_tree"
4343
:checked="userConfig.folder_tree"
4444
@update:checked="setConfig('folder_tree', $event)">
45-
{{ t('files', 'Enable folder tree') }}
45+
{{ t('files', 'Folder tree') }}
4646
</NcCheckboxRadioSwitch>
4747
</NcAppSettingsSection>
4848

49-
<!-- Visual settings -->
50-
<NcAppSettingsSection id="settings" :name="t('files', 'Visual settings')">
49+
<!-- Appearance -->
50+
<NcAppSettingsSection id="settings" :name="t('files', 'Appearance')">
5151
<NcCheckboxRadioSwitch data-cy-files-settings-setting="show_hidden"
5252
:checked="userConfig.show_hidden"
5353
@update:checked="setConfig('show_hidden', $event)">
@@ -58,16 +58,16 @@
5858
@update:checked="setConfig('show_mime_column', $event)">
5959
{{ t('files', 'Show file type column') }}
6060
</NcCheckboxRadioSwitch>
61+
<NcCheckboxRadioSwitch data-cy-files-settings-setting="show_files_extensions"
62+
:checked="userConfig.show_files_extensions"
63+
@update:checked="setConfig('show_files_extensions', $event)">
64+
{{ t('files', 'Show file extensions') }}
65+
</NcCheckboxRadioSwitch>
6166
<NcCheckboxRadioSwitch data-cy-files-settings-setting="crop_image_previews"
6267
:checked="userConfig.crop_image_previews"
6368
@update:checked="setConfig('crop_image_previews', $event)">
6469
{{ t('files', 'Crop image previews') }}
6570
</NcCheckboxRadioSwitch>
66-
<NcCheckboxRadioSwitch data-cy-files-settings-setting="show_files_extensions"
67-
:checked="userConfig.show_files_extensions"
68-
@update:checked="setConfig('show_files_extensions', $event)">
69-
{{ t('files', 'Show files extensions') }}
70-
</NcCheckboxRadioSwitch>
7171
</NcAppSettingsSection>
7272

7373
<!-- Settings API-->
@@ -85,7 +85,7 @@
8585
:label="t('files', 'WebDAV URL')"
8686
:show-trailing-button="true"
8787
:success="webdavUrlCopied"
88-
:trailing-button-label="t('files', 'Copy to clipboard')"
88+
:trailing-button-label="t('files', 'Copy')"
8989
:value="webdavUrl"
9090
class="webdav-url-input"
9191
readonly="readonly"
@@ -101,7 +101,7 @@
101101
:href="webdavDocs"
102102
target="_blank"
103103
rel="noreferrer noopener">
104-
{{ t('files', 'Use this address to access your Files via WebDAV.') }} ↗
104+
{{ t('files', 'How to access files using WebDAV') }} ↗
105105
</a>
106106
</em>
107107
<br>
@@ -113,22 +113,20 @@
113113
</NcAppSettingsSection>
114114

115115
<NcAppSettingsSection id="warning" :name="t('files', 'Warnings')">
116-
<em>{{ t('files', 'Prevent warning dialogs from open or reenable them.') }}</em>
117116
<NcCheckboxRadioSwitch type="switch"
118117
:checked="userConfig.show_dialog_file_extension"
119118
@update:checked="setConfig('show_dialog_file_extension', $event)">
120-
{{ t('files', 'Show a warning dialog when changing a file extension.') }}
119+
{{ t('files', 'Warn before changing a file extension') }}
121120
</NcCheckboxRadioSwitch>
122121
<NcCheckboxRadioSwitch type="switch"
123122
:checked="userConfig.show_dialog_deletion"
124123
@update:checked="setConfig('show_dialog_deletion', $event)">
125-
{{ t('files', 'Show a warning dialog when deleting files.') }}
124+
{{ t('files', 'Warn before deleting files') }}
126125
</NcCheckboxRadioSwitch>
127126
</NcAppSettingsSection>
128127

129128
<NcAppSettingsSection id="shortcuts"
130129
:name="t('files', 'Keyboard shortcuts')">
131-
<em>{{ t('files', 'Speed up your Files experience with these quick shortcuts.') }}</em>
132130

133131
<h3>{{ t('files', 'Actions') }}</h3>
134132
<dl>
@@ -137,39 +135,39 @@
137135
<kbd>a</kbd>
138136
</dt>
139137
<dd class="shortcut-description">
140-
{{ t('files', 'Open the actions menu for a file') }}
138+
{{ t('files', 'File actions') }}
141139
</dd>
142140
</div>
143141
<div>
144142
<dt class="shortcut-key">
145143
<kbd>F2</kbd>
146144
</dt>
147145
<dd class="shortcut-description">
148-
{{ t('files', 'Rename a file') }}
146+
{{ t('files', 'Rename') }}
149147
</dd>
150148
</div>
151149
<div>
152150
<dt class="shortcut-key">
153151
<kbd>Del</kbd>
154152
</dt>
155153
<dd class="shortcut-description">
156-
{{ t('files', 'Delete a file') }}
154+
{{ t('files', 'Delete') }}
157155
</dd>
158156
</div>
159157
<div>
160158
<dt class="shortcut-key">
161159
<kbd>s</kbd>
162160
</dt>
163161
<dd class="shortcut-description">
164-
{{ t('files', 'Favorite or remove a file from favorites') }}
162+
{{ t('files', 'Add or remove favorite') }}
165163
</dd>
166164
</div>
167165
<div v-if="isSystemtagsEnabled">
168166
<dt class="shortcut-key">
169167
<kbd>t</kbd>
170168
</dt>
171169
<dd class="shortcut-description">
172-
{{ t('files', 'Manage tags for a file') }}
170+
{{ t('files', 'Manage tags') }}
173171
</dd>
174172
</div>
175173
</dl>
@@ -189,23 +187,23 @@
189187
<kbd>ESC</kbd>
190188
</dt>
191189
<dd class="shortcut-description">
192-
{{ t('files', 'Deselect all files') }}
190+
{{ t('files', 'Deselect all') }}
193191
</dd>
194192
</div>
195193
<div>
196194
<dt class="shortcut-key">
197195
<kbd>Ctrl</kbd> + <kbd>Space</kbd>
198196
</dt>
199197
<dd class="shortcut-description">
200-
{{ t('files', 'Select or deselect a file') }}
198+
{{ t('files', 'Select or deselect') }}
201199
</dd>
202200
</div>
203201
<div>
204202
<dt class="shortcut-key">
205203
<kbd>Ctrl</kbd> + <kbd>Shift</kbd> <span>+ <kbd>Space</kbd></span>
206204
</dt>
207205
<dd class="shortcut-description">
208-
{{ t('files', 'Select a range of files') }}
206+
{{ t('files', 'Select a range') }}
209207
</dd>
210208
</div>
211209
</dl>
@@ -217,39 +215,39 @@
217215
<kbd>Alt</kbd> + <kbd>↑</kbd>
218216
</dt>
219217
<dd class="shortcut-description">
220-
{{ t('files', 'Navigate to the parent folder') }}
218+
{{ t('files', 'Go to parent folder') }}
221219
</dd>
222220
</div>
223221
<div>
224222
<dt class="shortcut-key">
225223
<kbd>↑</kbd>
226224
</dt>
227225
<dd class="shortcut-description">
228-
{{ t('files', 'Navigate to the file above') }}
226+
{{ t('files', 'Go to file above') }}
229227
</dd>
230228
</div>
231229
<div>
232230
<dt class="shortcut-key">
233231
<kbd>↓</kbd>
234232
</dt>
235233
<dd class="shortcut-description">
236-
{{ t('files', 'Navigate to the file below') }}
234+
{{ t('files', 'Go to file below') }}
237235
</dd>
238236
</div>
239237
<div>
240238
<dt class="shortcut-key">
241239
<kbd>←</kbd>
242240
</dt>
243241
<dd class="shortcut-description">
244-
{{ t('files', 'Navigate to the file on the left (in grid mode)') }}
242+
{{ t('files', 'Go left in grid') }}
245243
</dd>
246244
</div>
247245
<div>
248246
<dt class="shortcut-key">
249247
<kbd>→</kbd>
250248
</dt>
251249
<dd class="shortcut-description">
252-
{{ t('files', 'Navigate to the file on the right (in grid mode)') }}
250+
{{ t('files', 'Go right in grid') }}
253251
</dd>
254252
</div>
255253
</dl>
@@ -261,15 +259,15 @@
261259
<kbd>V</kbd>
262260
</dt>
263261
<dd class="shortcut-description">
264-
{{ t('files', 'Toggle the grid view') }}
262+
{{ t('files', 'Toggle grid view') }}
265263
</dd>
266264
</div>
267265
<div>
268266
<dt class="shortcut-key">
269267
<kbd>D</kbd>
270268
</dt>
271269
<dd class="shortcut-description">
272-
{{ t('files', 'Open the sidebar for a file') }}
270+
{{ t('files', 'Open file sidebar') }}
273271
</dd>
274272
</div>
275273
<div>
@@ -400,7 +398,7 @@ export default {
400398
401399
await navigator.clipboard.writeText(this.webdavUrl)
402400
this.webdavUrlCopied = true
403-
showSuccess(t('files', 'WebDAV URL copied to clipboard'))
401+
showSuccess(t('files', 'WebDAV URL copied'))
404402
setTimeout(() => {
405403
this.webdavUrlCopied = false
406404
}, 5000)

0 commit comments

Comments
 (0)