Merge pull request 'Bütçe verisi güncellendi' (#17) from ooguz/oyd-web:master into master

Reviewed-on: oyd/oyd-web#17

content/en/budget.md

@@ -4,9 +4,9 @@ translationKey: butce
 ---
 Özgür Yazılım Derneği affords only with the membership fees and donations from individuals. The budget of our association is very low to be compared with other NGOs. Our statement of financial position is presented to you within transperancy.  
 Commissions applied as 2.29% + 0.25 TRY for ÖzgürKon tickets and 10% for SMS donations; the given values are commission deducted.  
-The amounts are converted to USD with the exchange rate that was valid on May 23, 2020; to see them in TRY (Turkish Lira) please visit the Turkish version.
+The amounts are converted to USD with the exchange rate that was valid on Dec 10, 2020; to see them in TRY (Turkish Lira) please visit the Turkish version.
 
-## 2020 (January 1 - May 24)
+## 2020 (January 1 - December 1)
 
 #### Income
 
@@ -20,25 +20,25 @@ The amounts are converted to USD with the exchange rate that was valid on May 23
   <tbody>
     <tr>
       <td>Membership fees</td>
-      <td>85.13 USD</td>
+      <td>217.58 USD</td>
     </tr>
     <tr>
       <td>ÖzgürKon tickets (Net)</td>
-      <td>281.63 USD</td>
+      <td>245.28 USD</td>
     </tr>
     <tr>
       <td>ÖzgürKon sponsorships</td>
-      <td>73.39 USD</td>
+      <td>63.92 USD</td>
     </tr>
     <tr>
       <td>Donations (Bank)</td>
-      <td>17.55 USD</td>
+      <td>17.98 USD</td>
     </tr>
     <tr>
       <td>SMS donations (Net)</td>
-      <td>87.63 USD</td>
+      <td>187.54 USD</td>
     </tr>
-	<tr class="table-success"><td><strong>Total:</strong></td><td><strong>545.33 USD</strong></td></tr>
+	<tr class="table-success"><td><strong>Total:</strong></td><td><strong>732.30 USD</strong></td></tr>
   </tbody>
 </table>
 
@@ -52,23 +52,31 @@ The amounts are converted to USD with the exchange rate that was valid on May 23
     </tr>
   </thead>
   <tbody>
+    <tr>
+      <td>Rent for office (5 months)</td>
+      <td>95.88 USD</td>
+    </tr>
+    <tr>
+      <td>Condo fees</td>
+      <td>17.26 USD</td>
+    </tr>
     <tr>
       <td>General expenses (Servers, domains, printing e.g)</td>
-      <td>44.03 USD</td>
+      <td>38.35 USD</td>
     </tr>
     <tr>
       <td>Event expenses (Wikipedia Editathon e.g)</td>
-      <td>14.24 USD</td>
+      <td>12.40 USD</td>
     </tr>
     <tr>
-      <td>Other expenses (payment agent service fees e.g)</td>
+      <td>Other expenses (payment agent service fees, commissions e.g)</td>
-      <td>29.36 USD</td>
+      <td>73.12 USD</td>
     </tr>
-	<tr class="table-danger"><td><strong>Toplam:</strong></td><td><strong>87.63 USD</strong></td></tr>
+	<tr class="table-danger"><td><strong>Toplam:</strong></td><td><strong>237.01 USD</strong></td></tr>
   </tbody>
 </table>
 
-##### Spread: 457.70 USD
+##### Spread: 495.29 USD
 
 ## 2019 (January 1 - December 31)
 

content/tr/butce.md

@@ -6,7 +6,7 @@ translationKey: butce
 ÖzgürKon biletlerinden işlem başı %2.29 + 0,25 TRY, SMS bağışlarından %10 komisyon alınmaktadır, verilen tutarlar bu komisyonların düşülmüş halidir.  
 
 
-## 2020 (1 Ocak - 24 Mayıs)
+## 2020 (1 Ocak - 1 Aralık)
 
 #### Gelirler
 
@@ -19,8 +19,8 @@ translationKey: butce
   </thead>
   <tbody>
     <tr>
-      <td>Üye Aidatları</td>
+      <td>Üyeler tarafından yapılan bağışlar</td>
-      <td>580,00 TL</td>
+      <td>1702,00 TL</td>
     </tr>
     <tr>
       <td>ÖzgürKon bilet bağışları (Net)</td>
@@ -32,13 +32,13 @@ translationKey: butce
     </tr>
     <tr>
       <td>Bağışlar (Banka)</td>
-      <td>119,60 TL</td>
+      <td>140,63 TL</td>
     </tr>
     <tr>
       <td>SMS bağışları (Net)</td>
-      <td>597,00 TL</td>
+      <td>1467,00 TL</td>
     </tr>
-	<tr class="table-success"><td><strong>Toplam:</strong></td><td><strong>3715,33 TL</strong></td></tr>
+	<tr class="table-success"><td><strong>Toplam:</strong></td><td><strong>5728,36 TL</strong></td></tr>
   </tbody>
 </table>
 
@@ -52,23 +52,31 @@ translationKey: butce
     </tr>
   </thead>
   <tbody>
+    <tr>
+      <td>Kira (5 aylık)</td>
+      <td>750,00 TL</td>
+    </tr>
+    <tr>
+      <td>İş hanı aidatı</td>
+      <td>135,00 TL</td>
+    </tr>
     <tr>
       <td>Genel giderler (Sunucu, alan adı, matbaa vb.)</td>
       <td>300,00 TL</td>
     </tr>
     <tr>
-      <td>Etkinlik giderleri (Vikimaraton vb.)</td>
+      <td>Etkinlik giderleri (Vikimaraton, CryptoParty vb.)</td>
       <td>97,00 TL</td>
     </tr>
     <tr>
-      <td>Diğer giderler (iyzico hizmet ödemeleri vb.)</td>
+      <td>Diğer giderler (iyzico hizmet ödemeleri, emlak komisyonu vb.)</td>
-      <td>200,00 TL</td>
+      <td>572,00 TL</td>
     </tr>
-	<tr class="table-danger"><td><strong>Toplam:</strong></td><td><strong>597,00 TL</strong></td></tr>
+	<tr class="table-danger"><td><strong>Toplam:</strong></td><td><strong>1854,00 TL</strong></td></tr>
   </tbody>
 </table>
 
-##### Fark: 3118,33 TRY
+##### Fark: 3874,36 TRY
 
 ## 2019