Merge pull request 'fix: use proper letters' (#2 ) from hugo/decentrala-website-static-new:letters into master

fix: use proper letters
2023-08-03 17:26:21 +00:00 · 2023-08-03 19:13:33 +02:00
7 changed files with 25 additions and 88 deletions
--- a/index.html
+++ b/index.html
@@ -21,36 +21,29 @@
    </span>
  </header>
  <div id="main">
-    <h1>Dobrodosli!</h1>
+    <h1>Dobrodošao!</h1>
    <p>
-      Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog sirenja znanja.
-      Zvuci interesantno? Evo jos nekih stvari o nama:
+      Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja.
+      Zvuči interesantno? Evo još nekih stvari o nama:
    </p>
    <dl>
      <dt>Znanje:</dt>
-      <dd>Sve nase radionice su besplatne i otvorene za sve zainteresovane, a ako imate nesto sto zelite da
-        podelite, najavite se na nasem <a href="https://forum.dmz.rs">Forumu</a> i odrzite radionicu kod nas!</dd>
+      <dd>Sve naše radionice su besplatne i otvorene za sve zainteresovane.
+        Ako želiš nešto da podeliš najavi se na našem <a href="https://forum.dmz.rs">Forumu</a> i održi radionicu kod nas!</dd>
      <dt>Akcije:</dt>
-      <dd>Povremeno organizujemo razlicite akcije, hakatone, crypto-partije, izlozbe i slicne dogadjaje otvorene za sve
-        zainteresovane. </dd>
+      <dd>Povremeno organizujemo različite akcije, hakatone, crypto-partije, izložbe i slične događaje otvorene za sve zainteresovane. </dd>
      <dt>Servisi:</dt>
-      <dd>Na nasim serverima pokrecemo neke servise (email, git, wiki i druge) koji su otvoreni za sve i koje mozes
-        koristiti sa ili bez naseg naloga.</dd>
-      <dt>Ljudi:</dt>
-      <dd>Lorem ipsum dolor sit amet.</dd>
+      <dd>Na našim serverima pokrećemo razne servise (email, git, wiki i druge) koji su otvoreni za sve i koji se mogu koristiti sa ili bez našeg naloga.</dd>
    </dl>
    <p>
-      Ako si procitao sve i i dalje si zainteresovan, mozes da napravis <a href="/pages/account.html">nalog</a> na nasem
-      serveru koji ce
-      ti omoguciti da koristis sve nase <a href="/pages/services.html">servise</a>, a ako prvo hoces da vidis kako to
-      sve izgleda u realnosti, mozes da dodjes na neki od nasih <a href="/pages/events.html">dogadjaja</a>, i tamo nas
-      upoznas!
+      Ako si i dalje zainteresovan, možeš napraviti <a href="/pages/account.html">nalog</a> na našem serveru koji će ti omogućiti korišćenje svih naših <a href="/pages/services.html">servisa</a>.
+      Ako želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših <a href="/pages/events.html">događaja</a>, i tu nas upoznati!
    </p>
    <img id="mesh" src="/img/mesh-light.svg">
  </div>
  <footer>
    <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
@@ -58,7 +51,7 @@
    </div>
    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
    <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
@@ -68,7 +61,7 @@
      <span class="links">
        <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
            alt="CreativeCommons"></a>
-        <a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
+        <a href=""><img src="/img/w-light.svg" alt="Webring"></a>
        <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
            alt="SourceCode"></a>
        <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
@@ -78,4 +71,4 @@
  </footer>
 </body>

-</html>
+</html>
--- a/pages/account.html
+++ b/pages/account.html
@@ -25,7 +25,7 @@
  </div>
  <footer>
    <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
@@ -33,7 +33,7 @@
    </div>
    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
    <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
--- a/pages/blog.html
+++ b/pages/blog.html
@@ -25,7 +25,7 @@
  </div>
  <footer>
    <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
@@ -33,7 +33,7 @@
    </div>
    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
    <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
--- a/pages/contact.html
+++ b/pages/contact.html
@@ -21,16 +21,16 @@
  </header>
  <div id="main">
    <h1>Kontakt</h1>
-    <p>Mozes nam poslati mail na <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se mozes pridruziti nasem <a
+    <p>Možeš nam poslati mail na <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se mozes pridružiti našem <a
        href="https://forum.dmz.rs">Forumu</a>.</p>
-    <p>Takodje smo i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></p>
+    <p>Takođe smo i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></p>
    <p style="position: relative; top: 5rem;">U slucaju da nadjete <em>bug</em> na sajtu, bili bismo jako zahvalni
      ako bi mogli da nam ga prijavite (npr. putem emaila).</p>
    <img id="mesh" src="/img/mesh-light.svg">
  </div>
  <footer>
    <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
@@ -38,7 +38,7 @@
    </div>
    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
    <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
--- a/pages/projects.html
+++ b/pages/projects.html
@@ -25,7 +25,7 @@
  </div>
  <footer>
    <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
@@ -33,7 +33,7 @@
    </div>
    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
    <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
--- a/pages/services.html
+++ b/pages/services.html
@@ -66,7 +66,7 @@
  </div>
  <footer>
    <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
@@ -74,7 +74,7 @@
    </div>
    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
    <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
      <a href="/pages/projects.html">Projekti</a>
      <a href="/pages/blog.html">Blog</a>
      <a href="/pages/services.html">Servisi</a>
--- a/pages/webring.html
+++ b/pages/webring.html
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" href="/styles/style.css">
-  <link rel="stylesheet" href="/styles/blog.css">
-  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
-  <script src="/scripts/main.js" defer></script>
-  <title>Decentrala - Blog</title>
-</head>
-
-<body>
-  <header>
-    <a class="logo" href="/index.html">Decentrala</a>
-    <span>
-      <button id="theme-switcher">turn the lights off</button>
-      <a class="account" href="/pages/account.html">Nalog</a>
-    </span>
-  </header>
-  <div id="main">
-    <list>
-    <li> <a href="https://tilde.zone/explore">Tilde Zone</a> </li>
-    </list>
-    <img id="mesh" src="/img/mesh-light.svg">
-  </div>
-  <footer>
-    <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </div>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </span>
-    <span class="copyleft">
-      <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
-          alt="CreativeCommons"></a>
-      <a href=""><img src="/img/w-light.svg" alt="Webring"></a>
-      <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
-          alt="SourceCode"></a>
-      <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
-      <span>Decentrala &copy; 2023</span>
-    </span>
-  </footer>
-</body>
-
-</html>
Author	SHA1	Message	Date
eline	8b55a17040	Merge pull request 'fix: use proper letters' (#2 ) from hugo/decentrala-website-static-new:letters into master	2023-08-03 17:26:21 +00:00
Hugo	0a8f3167a6	fix: use proper letters	2023-08-03 19:13:33 +02:00