From a42af8330e61d966c21f8f763ba6562e4ed425db Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 2 Nov 2022 02:20:24 +0000 Subject: [PATCH 1/6] [tx-robot] updated from transifex Signed-off-by: Nextcloud bot --- l10n/zh_CN.js | 3 +++ l10n/zh_CN.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index 15d2f08a3..34fede03a 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -110,6 +110,9 @@ OC.L10N.register( "Search recipes with this keyword" : "用这个关键词搜索菜谱", "Date created" : "创建日期", "Last modified" : "最后更改", + "Preparation time (H:MM)" : "准备时间 (H:MM)", + "Cooking time (H:MM)" : "烹饪时间 (H:MM)", + "Total time (H:MM)" : "总时间 (H:MM)", "Serving Size" : "食用份量", "Energy" : "能量", "Sugar" : "糖", diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index b66aa6c8a..ece6f3b50 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -108,6 +108,9 @@ "Search recipes with this keyword" : "用这个关键词搜索菜谱", "Date created" : "创建日期", "Last modified" : "最后更改", + "Preparation time (H:MM)" : "准备时间 (H:MM)", + "Cooking time (H:MM)" : "烹饪时间 (H:MM)", + "Total time (H:MM)" : "总时间 (H:MM)", "Serving Size" : "食用份量", "Energy" : "能量", "Sugar" : "糖", From 767a9806fc6d8cf0b4a7bc0a8058d1851ab7e818 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Thu, 3 Nov 2022 02:20:07 +0000 Subject: [PATCH 2/6] [tx-robot] updated from transifex Signed-off-by: Nextcloud bot --- l10n/cs.js | 3 ++- l10n/cs.json | 3 ++- l10n/de.js | 3 ++- l10n/de.json | 3 ++- l10n/de_DE.js | 3 ++- l10n/de_DE.json | 3 ++- l10n/es.js | 3 ++- l10n/es.json | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/l10n/cs.js b/l10n/cs.js index 99c8c88f7..6f8c437ee 100644 --- a/l10n/cs.js +++ b/l10n/cs.js @@ -186,6 +186,7 @@ OC.L10N.register( "Failed to load search results" : "Nepodařilo se načíst výsledky vyhledávání", "Dismiss" : "Zahodit", "Cancel" : "Storno", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Přerušit úpravy" }, "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"); diff --git a/l10n/cs.json b/l10n/cs.json index 93c614e9a..73ff89781 100644 --- a/l10n/cs.json +++ b/l10n/cs.json @@ -184,6 +184,7 @@ "Failed to load search results" : "Nepodařilo se načíst výsledky vyhledávání", "Dismiss" : "Zahodit", "Cancel" : "Storno", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Přerušit úpravy" },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;" } \ No newline at end of file diff --git a/l10n/de.js b/l10n/de.js index 76dec1082..6c3608b18 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -186,6 +186,7 @@ OC.L10N.register( "Failed to load search results" : "Fehler beim Laden der Suchergebnisse", "Dismiss" : "Verwerfen", "Cancel" : "Abbrechen", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Bearbeitung abbrechen" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/de.json b/l10n/de.json index 1c80c5789..111c0f9cb 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -184,6 +184,7 @@ "Failed to load search results" : "Fehler beim Laden der Suchergebnisse", "Dismiss" : "Verwerfen", "Cancel" : "Abbrechen", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Bearbeitung abbrechen" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 327170665..bf1f08624 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -186,6 +186,7 @@ OC.L10N.register( "Failed to load search results" : "Fehler beim Laden der Suchergebnisse", "Dismiss" : "Ablehnen", "Cancel" : "Abbrechen", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Bearbeitung abbrechen" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/de_DE.json b/l10n/de_DE.json index 13020bd55..e2cb7af7a 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -184,6 +184,7 @@ "Failed to load search results" : "Fehler beim Laden der Suchergebnisse", "Dismiss" : "Ablehnen", "Cancel" : "Abbrechen", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Bearbeitung abbrechen" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/es.js b/l10n/es.js index 473d804a5..2e68e7457 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -186,6 +186,7 @@ OC.L10N.register( "Failed to load search results" : "Fallo al cargar los resultados de la búsqueda", "Dismiss" : "Descartar", "Cancel" : "Cancelar", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Abortar edición" }, "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/l10n/es.json b/l10n/es.json index 9f9bbcc53..8666b5c98 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -184,6 +184,7 @@ "Failed to load search results" : "Fallo al cargar los resultados de la búsqueda", "Dismiss" : "Descartar", "Cancel" : "Cancelar", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Abortar edición" },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" } \ No newline at end of file From 74959d867e5a6aa9b352fa01f44b9b6de41900d7 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 4 Nov 2022 02:20:08 +0000 Subject: [PATCH 3/6] [tx-robot] updated from transifex Signed-off-by: Nextcloud bot --- l10n/tr.js | 3 ++- l10n/tr.json | 3 ++- l10n/zh_HK.js | 3 ++- l10n/zh_HK.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/l10n/tr.js b/l10n/tr.js index a23812e93..bd9793af3 100644 --- a/l10n/tr.js +++ b/l10n/tr.js @@ -186,6 +186,7 @@ OC.L10N.register( "Failed to load search results" : "Arama sonuçları yüklenemedi", "Dismiss" : "Yok say", "Cancel" : "İptal", - "OK" : "Tamam" + "OK" : "Tamam", + "Abort editing" : "Düzenlemekten vazgeç" }, "nplurals=2; plural=(n > 1);"); diff --git a/l10n/tr.json b/l10n/tr.json index d884769fa..3b3dfb786 100644 --- a/l10n/tr.json +++ b/l10n/tr.json @@ -184,6 +184,7 @@ "Failed to load search results" : "Arama sonuçları yüklenemedi", "Dismiss" : "Yok say", "Cancel" : "İptal", - "OK" : "Tamam" + "OK" : "Tamam", + "Abort editing" : "Düzenlemekten vazgeç" },"pluralForm" :"nplurals=2; plural=(n > 1);" } \ No newline at end of file diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js index c71a6b2ac..d8c477228 100644 --- a/l10n/zh_HK.js +++ b/l10n/zh_HK.js @@ -186,6 +186,7 @@ OC.L10N.register( "Failed to load search results" : "無法加載搜尋結果", "Dismiss" : "撤銷", "Cancel" : "取消", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "中止編輯" }, "nplurals=1; plural=0;"); diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json index e0e8af104..ea2508911 100644 --- a/l10n/zh_HK.json +++ b/l10n/zh_HK.json @@ -184,6 +184,7 @@ "Failed to load search results" : "無法加載搜尋結果", "Dismiss" : "撤銷", "Cancel" : "取消", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "中止編輯" },"pluralForm" :"nplurals=1; plural=0;" } \ No newline at end of file From 96f5b97cf30a7c96214f0a6aa7483ae06eafe3cc Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 5 Nov 2022 02:21:16 +0000 Subject: [PATCH 4/6] [tx-robot] updated from transifex Signed-off-by: Nextcloud bot --- l10n/hu.js | 3 ++- l10n/hu.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/l10n/hu.js b/l10n/hu.js index 67c226abe..21ecfe07e 100644 --- a/l10n/hu.js +++ b/l10n/hu.js @@ -186,6 +186,7 @@ OC.L10N.register( "Failed to load search results" : "Nem sikerült betölteni a találatokat", "Dismiss" : "Eltüntetés", "Cancel" : "Mégse", - "OK" : "Rendben" + "OK" : "Rendben", + "Abort editing" : "Szerkesztés megszakítása" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/hu.json b/l10n/hu.json index b9b33da58..088993881 100644 --- a/l10n/hu.json +++ b/l10n/hu.json @@ -184,6 +184,7 @@ "Failed to load search results" : "Nem sikerült betölteni a találatokat", "Dismiss" : "Eltüntetés", "Cancel" : "Mégse", - "OK" : "Rendben" + "OK" : "Rendben", + "Abort editing" : "Szerkesztés megszakítása" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file From 7a65bb365b9003b4a26704a0db6b8240c9388074 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 6 Nov 2022 02:18:29 +0000 Subject: [PATCH 5/6] [tx-robot] updated from transifex Signed-off-by: Nextcloud bot --- l10n/pl.js | 3 ++- l10n/pl.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/l10n/pl.js b/l10n/pl.js index ab6b9160c..dba8fcd21 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -186,6 +186,7 @@ OC.L10N.register( "Failed to load search results" : "Nie udało się załadować wyników wyszukiwania", "Dismiss" : "Odrzuć", "Cancel" : "Anuluj", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Przerwij edycję" }, "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"); diff --git a/l10n/pl.json b/l10n/pl.json index 311890593..29e586571 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -184,6 +184,7 @@ "Failed to load search results" : "Nie udało się załadować wyników wyszukiwania", "Dismiss" : "Odrzuć", "Cancel" : "Anuluj", - "OK" : "OK" + "OK" : "OK", + "Abort editing" : "Przerwij edycję" },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" } \ No newline at end of file From 42ee8076abbe7087326569934fe9060a0b354791 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 6 Nov 2022 18:40:36 +0100 Subject: [PATCH 6/6] Added changelog entry Signed-off-by: Christian Wolf --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b9531058..6795319e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## [Unreleased] + + +## 0.10.0 - 2022-11-06 + +### Changed +- Update app to be compatible with Nextcloud server version 25 @christianlupus + ### Fixed - Allow import of recipes with HowToSections [#1255](https://github.com/nextcloud/cookbook/pull/1255) @christianlupus