Skip to content

Commit bf5ab9b

Browse files
AhsanIsEpicAhsanIsEpic
authored
Merge branch 'nextcloud:main' into fix/improve-folder-creation-handling
2 parents a44e74f + 7ad778a commit bf5ab9b

19 files changed

Lines changed: 866 additions & 792 deletions

‎.github/workflows/appstore-build-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
7272
# Skip if no package.json
7373
if: ${{ steps.versions.outputs.nodeVersion }}
74-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
74+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
7575
with:
7676
node-version: ${{ steps.versions.outputs.nodeVersion }}
7777

@@ -87,7 +87,7 @@ jobs:
8787
filename: ${{ env.APP_NAME }}/appinfo/info.xml
8888

8989
- name: Set up php ${{ steps.php-versions.outputs.php-min }}
90-
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
90+
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
9191
with:
9292
php-version: ${{ steps.php-versions.outputs.php-min }}
9393
coverage: none

‎.github/workflows/lint-eslint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
fallbackNpm: '^10'
6969

7070
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
71-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
71+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
7272
with:
7373
node-version: ${{ steps.versions.outputs.nodeVersion }}
7474

‎.github/workflows/lint-php-cs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
3535

3636
- name: Set up php${{ steps.versions.outputs.php-min }}
37-
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
37+
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
3838
with:
3939
php-version: ${{ steps.versions.outputs.php-min }}
4040
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

‎.github/workflows/lint-php.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
persist-credentials: false
5555

5656
- name: Set up php ${{ matrix.php-versions }}
57-
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
57+
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
5858
with:
5959
php-version: ${{ matrix.php-versions }}
6060
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

‎.github/workflows/node.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
fallbackNpm: '^10'
6666

6767
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
68-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
68+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
6969
with:
7070
node-version: ${{ steps.versions.outputs.nodeVersion }}
7171

‎.github/workflows/psalm-matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
persist-credentials: false
5858

5959
- name: Set up php${{ matrix.php-versions }}
60-
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
60+
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
6161
with:
6262
php-version: ${{ matrix.php-versions }}
6363
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Use Node 16
16-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.2.0
16+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.2.0
1717
with:
1818
node-version: 16
1919

2020
- name: Set up npm
2121
run: npm i -g npm@^8.0.0
2222

2323
- name: Setup PHP
24-
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
24+
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
2525
with:
2626
php-version: '7.4'
2727
extensions: mbstring, intl, sqlite3

‎l10n/da.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
OC.L10N.register(
22
"integration_google",
33
{
4+
"Error during OAuth exchanges" : "Fejl under OAuth-udvekslinger",
5+
"OAuth access token refused" : "OAuth adgangsnøgle afvist",
46
"Bad credentials" : "Forkerte legitimationsoplysninger",
57
"Connected accounts" : "Forbundne konti",
68
"Go to \"APIs & Services\" => \"Credentials\" and click on \"+ CREATE CREDENTIALS\" -> \"OAuth client ID\"." : "Gå til \"API'er & services\" => \"Legitimationsoplysninger\" og klik på \"+ OPRET LEGITIMATIONSOPLYSNINGER\" -> \"OAuth klient ID\".",

‎l10n/da.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{ "translations": {
2+
"Error during OAuth exchanges" : "Fejl under OAuth-udvekslinger",
3+
"OAuth access token refused" : "OAuth adgangsnøgle afvist",
24
"Bad credentials" : "Forkerte legitimationsoplysninger",
35
"Connected accounts" : "Forbundne konti",
46
"Go to \"APIs & Services\" => \"Credentials\" and click on \"+ CREATE CREDENTIALS\" -> \"OAuth client ID\"." : "Gå til \"API'er & services\" => \"Legitimationsoplysninger\" og klik på \"+ OPRET LEGITIMATIONSOPLYSNINGER\" -> \"OAuth klient ID\".",

‎l10n/de.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ OC.L10N.register(
1818
"Import Google data into Nextcloud" : "Google-Daten in Nextcloud importieren",
1919
"Google integration allows you to automatically migrate your Google calendars, contacts, photos and files into Nextcloud." : "Die Google-Einbindung hilft dir, deine Google-Kalender, Kontakte, Fotos und Dateien automatisch zu Nextcloud zu migrieren.",
2020
"Google admin options saved" : "Google-Administrationseinstellungen gespeichert",
21-
"Failed to save Google admin options" : "Fehler beim Speichern der Google-Verwaltungseinstellungen",
21+
"Failed to save Google admin options" : "Google-Administrationseinstellungen konnten nicht gespeichert werden",
2222
"If you want to allow your Nextcloud users to authenticate to Google, create an OAuth application in your Google settings." : "Wenn du deinen Benutzern erlauben willst, sich bei Google zu authentifizieren, erstelle eine OAuth-Anwendung in deinen Google Einstellungen.",
2323
"Google API settings" : "Google-API-Einstellungen",
2424
"Go to \"APIs & Services\" => \"Credentials\" and click on \"+ CREATE CREDENTIALS\" -> \"OAuth client ID\"." : "Wechsele zu \"API & Dienste\" => \"Anmeldeinformationen\" und klicke auf \"+ ANMELDEINFORMATIONEN ERSTELLEN\" -> \"OAuth Client-ID\"",
@@ -42,21 +42,21 @@ OC.L10N.register(
4242
"Successfully connected to Google!" : "Erfolgreich mit Google verbunden!",
4343
"Google connection error:" : "Google Verbindungsfehler:",
4444
"Google options saved" : "Google-Einstellungen gespeichert",
45-
"Failed to save Google options" : "Fehler beim Speichern der Google-Einstellungen.",
45+
"Failed to save Google options" : "Google-Einstellungen konnten nicht gespeichert werden",
4646
"Sign in with Google" : "Mit Google anmelden",
47-
"Failed to save Google OAuth state" : "Fehler beim Speichern des Google-OAuth-Status",
48-
"Failed to get Google Drive information" : "Fehler beim Abrufen der Google Drive-Informationen",
49-
"Failed to get calendar list" : "Fehler beim Abrufen der Kalender-Liste",
50-
"Failed to get number of Google photos" : "Fehler beim Abrufen der Anzahl der Google-Fotos",
51-
"Failed to get number of Google contacts" : "Fehler beim Abrufen der Anzahl der Google-Kontakte",
52-
"Failed to get address book list" : "Fehler beim Abrufen der Adressbuch-Liste",
47+
"Failed to save Google OAuth state" : "Google OAuth-Status konnte nicht gespeichert werden",
48+
"Failed to get Google Drive information" : "Google Drive-Informationen konnten nicht abgerufen werden",
49+
"Failed to get calendar list" : "Kalenderliste konnte nicht abgerufen werden",
50+
"Failed to get number of Google photos" : "Anzahl der Google Fotos konnte nicht abgerufen werden",
51+
"Failed to get number of Google contacts" : "Anzahl der Google Kontakte konnte nicht abgerufen werden",
52+
"Failed to get address book list" : "Adressbuchliste konnte nicht abgerufen werden",
5353
"_{nbSeen} Google contact seen. {nbAdded} added, {nbUpdated} updated in {name}_::_{nbSeen} Google contacts seen. {nbAdded} added, {nbUpdated} updated in {name}_" : ["{nbSeen} Google-Kontakt gesehen. {nbAdded} hinzugefügt, {nbUpdated} aktualisiert in {name}","{nbSeen} Google-Kontakte gesehen. {nbAdded} hinzugefügt, {nbUpdated} aktualisiert in {name}"],
54-
"_{total} event successfully imported in {name} ({nbAdded} created, {nbUpdated} updated)_::_{total} events successfully imported in {name} ({nbAdded} created, {nbUpdated} updated)_" : ["{total} Ereignis erfolgreich in {name} importiert ({nbAdded} erstellt, {nbUpdated} aktualisiert)","{total} Ereignisse erfolgreich in {name} importiert ({nbAdded} erstellt, {nbUpdated} aktualisiert)"],
54+
"_{total} event successfully imported in {name} ({nbAdded} created, {nbUpdated} updated)_::_{total} events successfully imported in {name} ({nbAdded} created, {nbUpdated} updated)_" : ["{total} Ereignis in {name} importiert ({nbAdded} erstellt, {nbUpdated} aktualisiert)","{total} Ereignisse in {name} importiert ({nbAdded} erstellt, {nbUpdated} aktualisiert)"],
5555
"Failed to import Google calendar" : "Google-Kalender konnte nicht importiert werden",
5656
"Starting importing photos in {targetPath} directory" : "Beginn des Imports von Fotos im Verzeichnis {targetPath}",
57-
"Failed to start importing Google photos" : "Fehler beim Starten des Imports von Google-Fotos",
57+
"Failed to start importing Google photos" : "Import von Google Fotos konnte nicht gestartet werden",
5858
"Starting importing files in {targetPath} directory" : "Import der Dateien im Verzeichnis {targetPath} starten",
59-
"Failed to start importing Google Drive" : "Fehler beim Starten des Imports von Google-Drive",
59+
"Failed to start importing Google Drive" : "Import von Google Drive konnte nicht gestartet werden",
6060
"Choose where to write imported files" : "Auswählen, wo die Dateien importiert werden sollen",
6161
"Choose where to write imported photos" : "Auswählen, wo die Fotos importiert werden sollen",
6262
"Google data migration" : "Google Datenmigration",

0 commit comments

Comments
 (0)