diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-03-12 16:08:48 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-03-12 16:08:48 +0100 |
| commit | 12736c4e95c5e889feef049a3352d9bc78a5f99d (patch) | |
| tree | 0b639d8984bbc77155229b42a37719667e5eeef3 | |
| parent | 8cca97d25e2aa3b4c7ee969bcceaf98132cc632d (diff) | |
| download | www-12736c4e95c5e889feef049a3352d9bc78a5f99d.tar.gz www-12736c4e95c5e889feef049a3352d9bc78a5f99d.zip | |
merge
| -rw-r--r-- | locale/es/LC_MESSAGES/messages.po | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index cccfca09..abf97b01 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po | |||
| @@ -1967,13 +1967,10 @@ msgstr "" | |||
| 1967 | msgid "Overview" | 1967 | msgid "Overview" |
| 1968 | msgstr "visión general" | 1968 | msgstr "visión general" |
| 1969 | 1969 | ||
| 1970 | <<<<<<< HEAD | ||
| 1971 | ======= | ||
| 1972 | #: template/gns.html.j2:37 | 1970 | #: template/gns.html.j2:37 |
| 1973 | msgid "Features" | 1971 | msgid "Features" |
| 1974 | msgstr "Características" | 1972 | msgstr "Características" |
| 1975 | 1973 | ||
| 1976 | >>>>>>> weblate/master | ||
| 1977 | #: template/gns.html.j2:39 | 1974 | #: template/gns.html.j2:39 |
| 1978 | msgid "" | 1975 | msgid "" |
| 1979 | "The GNU Name System (GNS) is secure and decentralized naming system. It " | 1976 | "The GNU Name System (GNS) is secure and decentralized naming system. It " |