Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
barisusakli committed Apr 25, 2024
2 parents f764a3e + dad57e0 commit 466ad0d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions install/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"multiparty": "4.2.3",
"nconf": "0.12.1",
"nodebb-plugin-2factor": "7.5.0",
"nodebb-plugin-composer-default": "10.2.33",
"nodebb-plugin-composer-default": "10.2.34",
"nodebb-plugin-dbsearch": "6.2.3",
"nodebb-plugin-emoji": "5.1.15",
"nodebb-plugin-emoji-android": "4.0.0",
Expand Down Expand Up @@ -154,8 +154,8 @@
},
"devDependencies": {
"@apidevtools/swagger-parser": "10.1.0",
"@commitlint/cli": "19.2.2",
"@commitlint/config-angular": "19.2.2",
"@commitlint/cli": "19.3.0",
"@commitlint/config-angular": "19.3.0",
"coveralls": "3.1.1",
"eslint": "8.57.0",
"eslint-config-nodebb": "0.2.1",
Expand Down
8 changes: 4 additions & 4 deletions public/language/tr/admin/advanced/events.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"filter-type": "Aktivite türü",
"filter-start": "Başlangıç zamanı",
"filter-end": "Bitiş zamanı",
"filter-user": "Filter by User",
"filter-user.placeholder": "Type user name to filter...",
"filter-group": "Filter by Group",
"filter-group.placeholder": "Type group name to filter...",
"filter-user": "Kullanıcı ismine göre filtrele",
"filter-user.placeholder": "Filtrelemek için kullanıcı adı girin...",
"filter-group": "Gruba göre filtrele",
"filter-group.placeholder": "Filtrelemek için grup adı girin...",
"filter-per-page": "Sayfa Başına"
}
2 changes: 1 addition & 1 deletion public/language/tr/admin/manage/users.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"alerts.x-users-found": "%1 kullanıcı bulundu, (%2 saniye)",
"alerts.select-a-single-user-to-change-email": "Select a single user to change email",
"export": "Dışa Aktar",
"export-users-fields-title": "Select CSV Fields",
"export-users-fields-title": "CSV Alanlarını seçin",
"export-field-email": "E-posta adresi",
"export-field-username": "Kullanıcı Adı",
"export-field-uid": "UID",
Expand Down
2 changes: 1 addition & 1 deletion public/language/tr/admin/settings/navigation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"id": "ID: <small>opsiyonel</small>",

"properties": "Özellikler:",
"show-to-groups": "Show to Groups:",
"show-to-groups": "Bu gruplara göster:",
"open-new-window": "Yeni pencerede aç",
"dropdown": "Açılır liste",
"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a class=&quot;dropdown-item&quot; href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
Expand Down
2 changes: 1 addition & 1 deletion public/language/tr/flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@
"bulk-actions": "Toplu Aksiyonlar",
"bulk-resolve": "Şikayetleri Çözümle",
"bulk-success": "%1 şikayet güncellendi",
"flagged-timeago": "Flagged <span class=\"timeago\" title=\"%1\"></span>",
"flagged-timeago": "Şikayet edildi <span class=\"timeago\" title=\"%1\"></span>",
"auto-flagged": "[Otomatik Şikayet] %1 tane eksi oy aldı."
}
14 changes: 7 additions & 7 deletions public/language/tr/user.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"user-menu": "Kullanıcı menüsü",
"banned": "Yasaklı",
"unbanned": "Unbanned",
"unbanned": "Yasağı kaldırıldı",
"muted": "Sessiz",
"unmuted": "Unmuted",
"unmuted": "Sesi açıldı",
"offline": "Çevrimdışı",
"deleted": "Silindi",
"username": "Kullanıcı Adı",
Expand Down Expand Up @@ -164,16 +164,16 @@
"sso.dissociate-confirm-title": "Ayrışmayı Onayla",
"sso.dissociate-confirm": "%1 'den ayrışmak istediğinizden emin misiniz?",
"info.latest-flags": "Son Şikayetler",
"info.profile": "Profile",
"info.post": "Post",
"info.view-flag": "View flag",
"info.reported-by": "Reported by:",
"info.profile": "Profil",
"info.post": "İleti",
"info.view-flag": "Şikayeti görüntüle",
"info.reported-by": "Şikayet eden:",
"info.no-flags": "Şikayet edilen bir ileti bulunamadı",
"info.ban-history": "Yasaklama Geçmişi",
"info.no-ban-history": "Bu kullanıcı daha önce hiç yasaklanmadı",
"info.banned-until": "Yasaklama süresi %1",
"info.banned-expiry": "Bitiş",
"info.ban-expired": "Ban expired",
"info.ban-expired": "Yasak süresi bitti",
"info.banned-permanently": "Kalıcı şekilde yasakla",
"info.banned-reason-label": "Gerekçe",
"info.banned-no-reason": "Gerekçe belirtilmedi.",
Expand Down

0 comments on commit 466ad0d

Please sign in to comment.