Mercurial > gemma

changeset 1845:ed197f094119

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Fadi Abbud <fadi.abbud@intevation.de>
date Thu, 17 Jan 2019 09:39:05 +0100
parents 4d082521fc57 (current diff) e36a54d98bd7 (diff)
children 1583cbca8ec5
files client/src/locale/de_AT/LC_MESSAGES/app.po client/src/locale/sk_SK/LC_MESSAGES/app.po
diffstat 2 files changed, 22 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/locale/de_AT/LC_MESSAGES/app.po	Thu Jan 17 09:31:56 2019 +0100
+++ b/client/src/locale/de_AT/LC_MESSAGES/app.po	Thu Jan 17 09:39:05 2019 +0100
@@ -8,10 +8,18 @@
 msgstr ""
 "Project-Id-Version: wamosjs 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< working copy
 "POT-Creation-Date: 2019-01-16 16:58+0100\n"
 "PO-Revision-Date: 2018-12-11 17:08+0000\n"
 "Last-Translator: Sascha L. Teichmann <sascha.teichmann@intevation.de>\n"
 "Language-Team: Austrian German <https://hosted.weblate.org/projects/gemma/client/de_AT/>\n"
+=======
+"POT-Creation-Date: 2018-12-10 15:30+0100\n"
+"PO-Revision-Date: 2019-01-16 16:25+0000\n"
+"Last-Translator: Bernhard E. Reiter <bernhard.reiter@intevation.de>\n"
+"Language-Team: Austrian German <https://hosted.weblate.org/projects/gemma/"
+"client/de_AT/>\n"
+>>>>>>> merge rev
 "Language: de_AT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -951,6 +959,10 @@
 "        <a href=\"https://download.geonames.org/export/dump/readme.txt\">GeoNames</a>\n"
 "        under %{ geoLicense }."
 msgstr ""
+"Verwendet\n"
+"        <a href=\"https://download.geonames.org/export/dump/readme.txt\""
+">GeoNames</a>\n"
+"        unter %{ geoLicense }."
 
 #: src/components/usermanagement/Userdetail.vue:91
 #: src/components/usermanagement/Usermanagement.vue:327
--- a/client/src/locale/sk_SK/LC_MESSAGES/app.po	Thu Jan 17 09:31:56 2019 +0100
+++ b/client/src/locale/sk_SK/LC_MESSAGES/app.po	Thu Jan 17 09:39:05 2019 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: wamosjs 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 09:31+0100\n"
+"POT-Creation-Date: 2018-12-10 15:30+0100\n"
 "PO-Revision-Date: 2019-01-16 16:25+0000\n"
 "Last-Translator: Fadi Abbud <fadi.abbud@intevation.de>\n"
 "Language-Team: Slovak <https://hosted.weblate.org/projects/gemma/client/sk/>\n"
@@ -212,7 +212,7 @@
 msgid "Email address"
 msgstr ""
 
-#: src/components/importschedule/Importscheduledetail.vue:50
+#: src/components/admin/importschedule/Importscheduledetail.vue:61
 #, fuzzy
 msgid "Email Notification"
 msgstr "Email Oznámenia"
@@ -472,6 +472,10 @@
 #: src/components/importschedule/Importscheduledetail.vue:563
 msgid "Monday"
 msgstr ""
+#: src/components/map/contextbox/Bottlenecks.vue:9
+#: src/components/map/contextbox/Staging.vue:12
+msgid "Name"
+msgstr "Názov"
 
 #: src/components/importschedule/Importscheduledetail.vue:559
 msgid "month"
@@ -881,6 +885,10 @@
 #: src/components/importschedule/Importscheduledetail.vue:564
 msgid "Tuesday"
 msgstr ""
+#: src/components/admin/importschedule/Importschedule.vue:34
+#: src/components/map/contextbox/Staging.vue:13
+msgid "Type"
+msgstr "Typ"
 
 #: src/components/importschedule/Importschedule.vue:34
 #: src/components/staging/Staging.vue:12