Merge branch 'develop' of https://github.com/mrzapp/nextcloud-cookbook into develop

Author: mrzapp

templates/content/edit.php

@@ -28,17 +28,17 @@
     </fieldset>
 
     <fieldset>
-        <label><?php p($l->t('Prep Time')); ?></label>
+        <label><?php p($l->t('Preparation time')); ?></label>
         <input type="text" name="prepTime" value="<?php if(isset($_['prepTime'])) {echo $_['prepTime']; } ?>" placeholder="PT0H15M">
     </fieldset>
 
     <fieldset>
-        <label><?php p($l->t('Cook Time')); ?></label>
+        <label><?php p($l->t('Cooking time')); ?></label>
         <input type="text" name="cookTime" value="<?php if(isset($_['cookTime'])) { echo $_['cookTime']; } ?>" placeholder="PT1H30M">
     </fieldset>
 
     <fieldset>
-        <label><?php p($l->t('Total Time')); ?></label>
+        <label><?php p($l->t('Total time')); ?></label>
         <input type="text" name="totalTime" value="<?php if(isset($_['totalTime'])) { echo $_['totalTime']; } ?>" placeholder="PT1H30M">
     </fieldset>
 

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/<lang>/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/<lang>/cookbook.po` file
+5. Commit and create pull request against the `develop` branch
 
 ## Introduction
 
@@ -42,6 +43,12 @@ git checkout -b <branchname>
 ```
 Replace `<branchname>` 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.

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 <[email protected]>, 2019.
+# Christian Wolf <[email protected]>, 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 <[email protected]>\n"
+"PO-Revision-Date: 2019-12-19 11:36+0100\n"
+"Last-Translator: Christian Wolf <[email protected]>\n"
 "Language-Team: German <[email protected]>\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"

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 <[email protected]>, 2019.
+# Christian Wolf <[email protected]>, 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 <[email protected]>\n"
+"PO-Revision-Date: 2019-12-19 11:37+0100\n"
+"Last-Translator: Christian Wolf <[email protected]>\n"
 "Language-Team: German <[email protected]>\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 ""

translationfiles/es/cookbook.po

@@ -215,60 +215,70 @@ msgstr "Seleccionar una carpeta"
 #. TRANSLATORS The description of the recipe
 #: /tmp/nextcloud-cookbook/templates/content/edit.php:14
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #: /tmp/nextcloud-cookbook/templates/content/edit.php:19
 msgid "Source URL"
-msgstr ""
-
-#: /tmp/nextcloud-cookbook/templates/content/edit.php:29
-msgid "Prep Time"
-msgstr ""
-
-#: /tmp/nextcloud-cookbook/templates/content/edit.php:34
-msgid "Cook Time"
-msgstr ""
+msgstr "URL de origen"
 
 #: /tmp/nextcloud-cookbook/templates/content/recipe.php:10
 msgid "Print recipe"
-msgstr ""
+msgstr "Imprimir receta"
 
 #: /tmp/nextcloud-cookbook/templates/content/recipe.php:18
 msgid "Source"
-msgstr ""
+msgstr "Origen"
 
 #: /tmp/nextcloud-cookbook/templates/content/recipe.php:28
 msgid "Preparation time"
-msgstr ""
+msgstr "Tiempo de preparación"
 
 #: /tmp/nextcloud-cookbook/templates/content/recipe.php:36
 msgid "Cooking time"
-msgstr ""
+msgstr "Tiempo de cocción"
 
 #: /tmp/nextcloud-cookbook/js/script.js:108
 msgid "Could not set recipe update interval to {interval}"
-msgstr ""
+msgstr "No se puede ajustar el intervalo de actualización de la receta a {interval}"
 
 #: /tmp/nextcloud-cookbook/templates/content/edit.php:21
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: /tmp/nextcloud-cookbook/templates/content/edit.php:26
 msgid "Image"
-msgstr ""
+msgstr "Imagen"
 
 #: /tmp/nextcloud-cookbook/templates/content/edit.php:27
 msgid "Pick a local image"
-msgstr ""
+msgstr "Seleccione una imagen local"
 
 #: /tmp/nextcloud-cookbook/templates/navigation/index.php:28
 msgid "All"
-msgstr ""
+msgstr "Todo"
 
 #: /tmp/nextcloud-cookbook/templates/settings/index.php:17
 msgid "Update interval in minutes"
-msgstr ""
+msgstr "Intervalo de actualización en minutos"
 
 #: /tmp/nextcloud-cookbook/templates/settings/index.php:19
 msgid "Last update"
+msgstr "Última actualización"
+
+#: /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 ""

translationfiles/fr/cookbook.po

@@ -221,14 +221,6 @@ msgstr "Description"
 msgid "Source URL"
 msgstr "URL source"
 
-#: /tmp/nextcloud-cookbook/templates/content/edit.php:29
-msgid "Prep Time"
-msgstr "Temps prép."
-
-#: /tmp/nextcloud-cookbook/templates/content/edit.php:34
-msgid "Cook Time"
-msgstr "Temps cuisson"
-
 #: /tmp/nextcloud-cookbook/templates/content/recipe.php:10
 msgid "Print recipe"
 msgstr "Imprimer recette"
@@ -272,3 +264,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 "Chemin vers votre image pour illustrer la recette"
+
+#: /srv/http/nc/apps/cookbook/templates/content/edit.php:41
+#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:42
+msgid "Total time"
+msgstr "Temps total"
+
+#: /srv/http/nc/apps/cookbook/templates/content/edit.php:56
+#: /srv/http/nc/apps/cookbook/templates/content/recipe.php:51
+msgid "Tools"
+msgstr "Ustensiles"
+
+#: /srv/http/nc/apps/cookbook/templates/navigation/index.php:29
+msgid "Uncategorized"
+msgstr "Non classé"

translationfiles/nl/cookbook.po

@@ -107,14 +107,6 @@ msgstr "Afbeelding"
 msgid "Pick a local image"
 msgstr "Kies een lokale afbeelding"
 
-#: /tmp/nextcloud-cookbook/templates/content/edit.php:31
-msgid "Prep Time"
-msgstr "Bereidingstijd"
-
-#: /tmp/nextcloud-cookbook/templates/content/edit.php:36
-msgid "Cook Time"
-msgstr "Kooktijd"
-
 #: /tmp/nextcloud-cookbook/templates/content/edit.php:41
 msgid "Keywords (comma-separated)"
 msgstr "Trefwoorden (gescheiden door een komma)"
@@ -205,3 +197,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 ""