diff options
| -rw-r--r-- | .github/workflows/cypress.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/oci.yml | 2 | ||||
| -rw-r--r-- | l10n/hr.js | 2 | ||||
| -rw-r--r-- | l10n/hr.json | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index ea00e6f19..492356797 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -18,7 +18,7 @@ jobs: containers: [1, 2, 3] php-versions: [ '7.4' ] databases: [ 'sqlite' ] - server-versions: [ 'master' ] + server-versions: [ 'stable20' ] steps: - name: Checkout server diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml index 8105b3ae0..0111c2ea8 100644 --- a/.github/workflows/oci.yml +++ b/.github/workflows/oci.yml @@ -20,7 +20,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['oci'] - server-versions: ['master'] + server-versions: ['stable20'] name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} diff --git a/l10n/hr.js b/l10n/hr.js index 4a8a29554..ccca8aa43 100644 --- a/l10n/hr.js +++ b/l10n/hr.js @@ -9,6 +9,8 @@ OC.L10N.register( "** 📝 Collaborative document editing!**\n\n- **📝 Focused writing:** No distractions, only the formatting you need.\n- **🙋 Work together:** Share and collaborate with friends and colleagues, no matter if they use Nextcloud or not!\n- **💾 Open format:** Files are saved as [Markdown](https://en.wikipedia.org/wiki/Markdown), so you can edit them from any other text app too.\n- **✊ Strong foundation:** We use [🐈 tiptap](https://tiptap.scrumpy.io) which is based on [🦉 ProseMirror](https://prosemirror.net) – huge thanks to them!" : "** 📝 Zajedničko obrađivanje dokumenata!**\n\n- **📝 Usredotočite se na pisanje:** bez ikakvih ometanja, koristite se formatiranjem koje vam je potrebno.\n- **🙋 Radite zajedno:** dijelite i surađujte s prijateljima i kolegama neovisno o tome imaju li Nextcloud!\n- **💾 Otvoren format:** datoteke se spremaju kao [Markdown](https://en.wikipedia.org/wiki/Markdown) kako biste ih mogli uređivati iz bilo koje aplikacije za uređivanje teksta.\n- **✊ Snažni temelji:** koristimo [🐈 tiptap](https://tiptap.scrumpy.io) temeljen na [🦉 ProseMirror](https://prosemirror.net) – puno im hvala!", "Use current version" : "Koristi trenutnu verziju", "Use the saved version" : "Koristi spremljenu verziju", + "Document idle for {timeout} minutes, click to continue editing" : "Dokument ne reagira {timeout} minuta, kliknite za nastavak uređivanja", + "Reconnect" : "Ponovno povezivanje", "The document has been changed outside of the editor. The changes cannot be applied." : "Dokument je promijenjen izvan uređivača teksta. Nije moguće primijeniti izmjene.", "File could not be loaded. Please check your internet connection." : "Datoteka nije učitana. Provjerite internetsku vezu.", "Last saved {lastSaved}" : "Posljednje spremljeno {lastSave}", diff --git a/l10n/hr.json b/l10n/hr.json index 15d492c1d..b91c5e4a2 100644 --- a/l10n/hr.json +++ b/l10n/hr.json @@ -7,6 +7,8 @@ "** 📝 Collaborative document editing!**\n\n- **📝 Focused writing:** No distractions, only the formatting you need.\n- **🙋 Work together:** Share and collaborate with friends and colleagues, no matter if they use Nextcloud or not!\n- **💾 Open format:** Files are saved as [Markdown](https://en.wikipedia.org/wiki/Markdown), so you can edit them from any other text app too.\n- **✊ Strong foundation:** We use [🐈 tiptap](https://tiptap.scrumpy.io) which is based on [🦉 ProseMirror](https://prosemirror.net) – huge thanks to them!" : "** 📝 Zajedničko obrađivanje dokumenata!**\n\n- **📝 Usredotočite se na pisanje:** bez ikakvih ometanja, koristite se formatiranjem koje vam je potrebno.\n- **🙋 Radite zajedno:** dijelite i surađujte s prijateljima i kolegama neovisno o tome imaju li Nextcloud!\n- **💾 Otvoren format:** datoteke se spremaju kao [Markdown](https://en.wikipedia.org/wiki/Markdown) kako biste ih mogli uređivati iz bilo koje aplikacije za uređivanje teksta.\n- **✊ Snažni temelji:** koristimo [🐈 tiptap](https://tiptap.scrumpy.io) temeljen na [🦉 ProseMirror](https://prosemirror.net) – puno im hvala!", "Use current version" : "Koristi trenutnu verziju", "Use the saved version" : "Koristi spremljenu verziju", + "Document idle for {timeout} minutes, click to continue editing" : "Dokument ne reagira {timeout} minuta, kliknite za nastavak uređivanja", + "Reconnect" : "Ponovno povezivanje", "The document has been changed outside of the editor. The changes cannot be applied." : "Dokument je promijenjen izvan uređivača teksta. Nije moguće primijeniti izmjene.", "File could not be loaded. Please check your internet connection." : "Datoteka nije učitana. Provjerite internetsku vezu.", "Last saved {lastSaved}" : "Posljednje spremljeno {lastSave}", |