From 1b23e98801d94c91abe3a7f39309eb6036606bec Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Thu, 19 Dec 2019 13:11:41 +0100 Subject: [PATCH] Updated translations This commit removes duplicate translations due to different spelling in the PHP files. Further, all languages are updated to contain all new translations. The German translations is additionally updated to be complete. --- templates/content/edit.php | 6 +- translationfiles/README.md | 13 +- translationfiles/de/cookbook.po | 33 +++-- translationfiles/de_DE/cookbook.po | 37 ++++- translationfiles/es/cookbook.po | 18 +++ translationfiles/fr/cookbook.po | 18 +++ translationfiles/nl/cookbook.po | 18 +++ translationfiles/pl/cookbook.po | 18 +++ translationfiles/templates/cookbook.pot | 173 +++++++++++++----------- 9 files changed, 232 insertions(+), 102 deletions(-) diff --git a/templates/content/edit.php b/templates/content/edit.php index b321ad11..32f1df5f 100755 --- a/templates/content/edit.php +++ b/templates/content/edit.php @@ -28,17 +28,17 @@
- +
- +
- +
diff --git a/translationfiles/README.md b/translationfiles/README.md index 5cd4e55b..329d89c4 100644 --- a/translationfiles/README.md +++ b/translationfiles/README.md @@ -7,8 +7,9 @@ This is a quick instruction how to generate translations for the Nextcloud app ` 1. Clone a user fork of the [cookbook app](https://github.com/mrzapp/nextcloud-cookbook) 2. Create new branch and checkout -3. Use the `translationfiles/template/cookbook.pot` template and generate/update the `translationfiles//cookbook.po` file -4. Commit and create pull request against the `develop` branch +3. Update the translation template by calling `update-pot.sh` in the root folder +4. Use the `translationfiles/template/cookbook.pot` template and generate/update the `translationfiles//cookbook.po` file +5. Commit and create pull request against the `develop` branch ## Introduction @@ -42,6 +43,12 @@ git checkout -b ``` Replace `` with something useful like `translation/de`. +Ideally, you update the translation template to be up-to-date. +Otherwise, newly added texts are not presented for translation. +To do so, go to the root folder of your git repository. +Call the command `update-pot.sh` there. +You might need to install a _gettext_ package if the command `msgcat` is not found. + Go into the folder `translationfiles`. Create a new folder with the corresponding language code (e.g. `de`). Copy the template file from `template/cookcook.pot` to the file `cookbook.po` (without the `t` at the end) in your newly created folder. @@ -53,6 +60,8 @@ Go to the next section to make the translations themselves as if you would simpl ## Steps to modify an existing translation If not already done, start with the steps from the previous section (Generate a new translation) to checkout and create a local branch. +Optionally, update the translation template to be up-to-date. +Call `update-pot.sh` in the repo's root folder (see previous section) to do so. Then go to the folder `translationfiles` in your repo. Within it there should be a folder named with the desired language code (e.g. `de`). Enter this folder. diff --git a/translationfiles/de/cookbook.po b/translationfiles/de/cookbook.po index b7793ccb..e4b94daf 100644 --- a/translationfiles/de/cookbook.po +++ b/translationfiles/de/cookbook.po @@ -1,21 +1,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Nextcloud package. # -# Christian Wolf , 2019. +# Christian Wolf , 2019. msgid "" msgstr "" "Project-Id-Version: Nextcloud 3.14159\n" "Report-Msgid-Bugs-To: translations\\@example.com\n" "POT-Creation-Date: 2019-08-08 14:07+0200\n" -"PO-Revision-Date: 2019-10-15 13:08+0200\n" -"Last-Translator: Christian Wolf \n" +"PO-Revision-Date: 2019-12-19 11:36+0100\n" +"Last-Translator: Christian Wolf \n" "Language-Team: German \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.08.1\n" +"X-Generator: Lokalize 19.08.3\n" #: /srv/http/nc/apps/cookbook/js/script.js:91 msgid "Path to your recipe collection" @@ -224,14 +224,6 @@ msgstr "Beschreibung" msgid "Source URL" msgstr "Quell-URL" -#: /tmp/nextcloud-cookbook/templates/content/edit.php:29 -msgid "Prep Time" -msgstr "Vorbereitungsdauer" - -#: /tmp/nextcloud-cookbook/templates/content/edit.php:34 -msgid "Cook Time" -msgstr "Kochdauer" - #: /tmp/nextcloud-cookbook/templates/content/recipe.php:10 msgid "Print recipe" msgstr "Rezept drucken" @@ -271,3 +263,20 @@ msgstr "Aktualisierungsintervall in Minuten" #: /tmp/nextcloud-cookbook/templates/settings/index.php:19 msgid "Last update" msgstr "Letzte Aktualisierung" + +#: /srv/http/nc/apps/cookbook/js/script.js:201 +msgid "Path to your Recipe Image" +msgstr "Pfad zum Rezeptbild" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:56 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:51 +msgid "Tools" +msgstr "Utensilien" + +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:42 +msgid "Total time" +msgstr "Gesamtzeit" + +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:29 +msgid "Uncategorized" +msgstr "Ohne Kategorie" diff --git a/translationfiles/de_DE/cookbook.po b/translationfiles/de_DE/cookbook.po index 369123ca..43181f5d 100644 --- a/translationfiles/de_DE/cookbook.po +++ b/translationfiles/de_DE/cookbook.po @@ -1,21 +1,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Nextcloud package. # -# Christian Wolf , 2019. +# Christian Wolf , 2019. msgid "" msgstr "" "Project-Id-Version: Nextcloud 3.14159\n" "Report-Msgid-Bugs-To: translations\\@example.com\n" "POT-Creation-Date: 2019-08-08 14:07+0200\n" -"PO-Revision-Date: 2019-10-15 13:35+0200\n" -"Last-Translator: Christian Wolf \n" +"PO-Revision-Date: 2019-12-19 11:37+0100\n" +"Last-Translator: Christian Wolf \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.08.1\n" +"X-Generator: Lokalize 19.08.3\n" #: /srv/http/nc/apps/cookbook/js/script.js:91 msgid "Path to your recipe collection" @@ -271,3 +271,32 @@ msgstr "Aktualisierungsintervall in Minuten" #: /tmp/nextcloud-cookbook/templates/settings/index.php:19 msgid "Last update" msgstr "Letzte Aktualisierung" + +#: /srv/http/nc/apps/cookbook/js/script.js:201 +msgid "Path to your Recipe Image" +msgstr "Pfad zum Rezeptbild" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:41 +msgid "Total Time" +msgstr "Gesamtzeit" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:56 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:51 +msgid "Tools" +msgstr "Utensilien" + +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:42 +msgid "Total time" +msgstr "Gesamtzeit" + +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:29 +msgid "Uncategorized" +msgstr "Ohne Kategorie" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:31 +msgid "Prep time" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:36 +msgid "Cook time" +msgstr "" diff --git a/translationfiles/es/cookbook.po b/translationfiles/es/cookbook.po index 4e4f8598..2f5920ea 100644 --- a/translationfiles/es/cookbook.po +++ b/translationfiles/es/cookbook.po @@ -272,3 +272,21 @@ msgstr "" #: /tmp/nextcloud-cookbook/templates/settings/index.php:19 msgid "Last update" msgstr "" + +#: /srv/http/nc/apps/cookbook/js/script.js:201 +msgid "Path to your Recipe Image" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:41 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:42 +msgid "Total time" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:56 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:51 +msgid "Tools" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:29 +msgid "Uncategorized" +msgstr "" diff --git a/translationfiles/fr/cookbook.po b/translationfiles/fr/cookbook.po index 59b849a2..c985cd26 100644 --- a/translationfiles/fr/cookbook.po +++ b/translationfiles/fr/cookbook.po @@ -272,3 +272,21 @@ msgstr "Intervalle de mise à jour en minutes" #: /tmp/nextcloud-cookbook/templates/settings/index.php:19 msgid "Last update" msgstr "Dernière mise à jour" + +#: /srv/http/nc/apps/cookbook/js/script.js:201 +msgid "Path to your Recipe Image" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:41 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:42 +msgid "Total time" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:56 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:51 +msgid "Tools" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:29 +msgid "Uncategorized" +msgstr "" diff --git a/translationfiles/nl/cookbook.po b/translationfiles/nl/cookbook.po index 300ada07..1645b5fd 100644 --- a/translationfiles/nl/cookbook.po +++ b/translationfiles/nl/cookbook.po @@ -205,3 +205,21 @@ msgstr "Update-interval in minuten" #: /tmp/nextcloud-cookbook/templates/settings/index.php:19 msgid "Last update" msgstr "Laatste update" + +#: /srv/http/nc/apps/cookbook/js/script.js:201 +msgid "Path to your Recipe Image" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:41 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:42 +msgid "Total time" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:56 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:51 +msgid "Tools" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:29 +msgid "Uncategorized" +msgstr "" diff --git a/translationfiles/pl/cookbook.po b/translationfiles/pl/cookbook.po index 325fd8db..7c5ec640 100644 --- a/translationfiles/pl/cookbook.po +++ b/translationfiles/pl/cookbook.po @@ -272,3 +272,21 @@ msgstr "Interwał aktualizacji w minutach" #: /tmp/nextcloud-cookbook/templates/settings/index.php:19 msgid "Last update" msgstr "Ostatnia aktualizacja" + +#: /srv/http/nc/apps/cookbook/js/script.js:201 +msgid "Path to your Recipe Image" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:41 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:42 +msgid "Total time" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:56 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:51 +msgid "Tools" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:29 +msgid "Uncategorized" +msgstr "" diff --git a/translationfiles/templates/cookbook.pot b/translationfiles/templates/cookbook.pot index e7cba7e0..10bce190 100644 --- a/translationfiles/templates/cookbook.pot +++ b/translationfiles/templates/cookbook.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Nextcloud 3.14159\n" "Report-Msgid-Bugs-To: translations\\@example.com\n" -"POT-Creation-Date: 2019-10-15 13:02+0200\n" +"POT-Creation-Date: 2019-12-19 11:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,60 +17,63 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: /tmp/nextcloud-cookbook/js/script.js:108 +#: /srv/http/nc/apps/cookbook/js/script.js:108 msgid "Could not set recipe update interval to {interval}" msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:115 -#: /tmp/nextcloud-cookbook/js/script.js:201 +#: /srv/http/nc/apps/cookbook/js/script.js:115 msgid "Path to your recipe collection" msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:130 +#: /srv/http/nc/apps/cookbook/js/script.js:130 msgid "Could not set recipe folder to {path}" msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:155 +#: /srv/http/nc/apps/cookbook/js/script.js:155 msgid "Please pick a recipe" msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:185 +#: /srv/http/nc/apps/cookbook/js/script.js:185 msgid "Could not load recipe" msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:216 +#: /srv/http/nc/apps/cookbook/js/script.js:201 +msgid "Path to your Recipe Image" +msgstr "" + +#: /srv/http/nc/apps/cookbook/js/script.js:216 msgid "Are you sure you want to delete this recipe?" msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:233 +#: /srv/http/nc/apps/cookbook/js/script.js:233 msgid "Failed to delete recipe" msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:320 +#: /srv/http/nc/apps/cookbook/js/script.js:320 msgid "Could not update recipe" msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:373 +#: /srv/http/nc/apps/cookbook/js/script.js:373 msgid "Could not add recipe" msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:408 +#: /srv/http/nc/apps/cookbook/js/script.js:410 msgid "Could not rebuild recipe index." msgstr "" -#: /tmp/nextcloud-cookbook/js/script.js:465 +#: /srv/http/nc/apps/cookbook/js/script.js:469 msgid "Failed to fetch recipes" msgstr "" -#: /tmp/nextcloud-cookbook/specialAppInfoFakeDummyForL10nScript.php:2 +#: /srv/http/nc/apps/cookbook/specialAppInfoFakeDummyForL10nScript.php:2 msgid "Cookbook" msgstr "" -#: /tmp/nextcloud-cookbook/specialAppInfoFakeDummyForL10nScript.php:3 +#: /srv/http/nc/apps/cookbook/specialAppInfoFakeDummyForL10nScript.php:3 msgid "An integrated cookbook using schema.org JSON files as recipes" msgstr "" -#: /tmp/nextcloud-cookbook/specialAppInfoFakeDummyForL10nScript.php:4 +#: /srv/http/nc/apps/cookbook/specialAppInfoFakeDummyForL10nScript.php:4 msgid "" "A library for all your recipes. It uses JSON files following the schema.org " "recipe format. To add a recipe to the collection, you can paste in the URL " @@ -79,122 +82,130 @@ msgid "" msgstr "" #. TRANSLATORS The name of the recipe -#: /tmp/nextcloud-cookbook/templates/content/edit.php:10 +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:10 msgid "Name" msgstr "" #. TRANSLATORS The description of the recipe -#: /tmp/nextcloud-cookbook/templates/content/edit.php:16 +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:16 msgid "Description" msgstr "" -#: /tmp/nextcloud-cookbook/templates/content/edit.php:21 +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:21 msgid "URL" msgstr "" -#: /tmp/nextcloud-cookbook/templates/content/edit.php:26 +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:26 msgid "Image" msgstr "" -#: /tmp/nextcloud-cookbook/templates/content/edit.php:27 +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:27 msgid "Pick a local image" msgstr "" -#: /tmp/nextcloud-cookbook/templates/content/edit.php:31 -msgid "Prep Time" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/edit.php:36 -msgid "Cook Time" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/edit.php:41 -msgid "Keywords (comma-separated)" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/edit.php:46 -#: /tmp/nextcloud-cookbook/templates/content/recipe.php:37 -msgid "Servings" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/edit.php:51 -#: /tmp/nextcloud-cookbook/templates/content/recipe.php:43 -msgid "Ingredients" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/edit.php:71 -#: /tmp/nextcloud-cookbook/templates/content/recipe.php:53 -msgid "Instructions" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/edit.php:90 -msgid "Save" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/recipe.php:7 -msgid "Edit recipe" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/recipe.php:8 -msgid "Print recipe" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/recipe.php:9 -msgid "Delete recipe" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/recipe.php:16 -msgid "Source" -msgstr "" - -#: /tmp/nextcloud-cookbook/templates/content/recipe.php:26 +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:31 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:26 msgid "Preparation time" msgstr "" -#: /tmp/nextcloud-cookbook/templates/content/recipe.php:34 +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:36 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:34 msgid "Cooking time" msgstr "" -#: /tmp/nextcloud-cookbook/templates/navigation/index.php:2 +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:41 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:42 +msgid "Total time" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:46 +msgid "Keywords (comma-separated)" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:51 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:45 +msgid "Servings" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:56 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:51 +msgid "Tools" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:77 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:58 +msgid "Ingredients" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:99 +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:68 +msgid "Instructions" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/edit.php:120 +msgid "Save" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:7 +msgid "Edit recipe" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:8 +msgid "Print recipe" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:9 +msgid "Delete recipe" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:16 +msgid "Source" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:2 msgid "Create recipe" msgstr "" -#: /tmp/nextcloud-cookbook/templates/navigation/index.php:6 +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:6 msgid "Recipe URL" msgstr "" -#: /tmp/nextcloud-cookbook/templates/navigation/index.php:7 +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:7 msgid "Download recipe" msgstr "" -#: /tmp/nextcloud-cookbook/templates/navigation/index.php:14 +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:14 msgid "Search" msgstr "" -#: /tmp/nextcloud-cookbook/templates/navigation/index.php:28 +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:28 msgid "All" msgstr "" -#: /tmp/nextcloud-cookbook/templates/settings/index.php:3 +#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:29 +msgid "Uncategorized" +msgstr "" + +#: /srv/http/nc/apps/cookbook/templates/settings/index.php:3 msgid "Settings" msgstr "" -#: /tmp/nextcloud-cookbook/templates/settings/index.php:9 +#: /srv/http/nc/apps/cookbook/templates/settings/index.php:9 msgid "Rescan library" msgstr "" -#: /tmp/nextcloud-cookbook/templates/settings/index.php:12 +#: /srv/http/nc/apps/cookbook/templates/settings/index.php:12 msgid "Recipe folder" msgstr "" -#: /tmp/nextcloud-cookbook/templates/settings/index.php:13 +#: /srv/http/nc/apps/cookbook/templates/settings/index.php:13 msgid "Please pick a folder" msgstr "" -#: /tmp/nextcloud-cookbook/templates/settings/index.php:17 +#: /srv/http/nc/apps/cookbook/templates/settings/index.php:17 msgid "Update interval in minutes" msgstr "" -#: /tmp/nextcloud-cookbook/templates/settings/index.php:19 +#: /srv/http/nc/apps/cookbook/templates/settings/index.php:19 msgid "Last update" msgstr ""