Skip to content

Commit c28ed01

Browse files
authored
Merge branch 'znc:master' into master
2 parents 43925e8 + 6158a2b commit c28ed01

7 files changed

Lines changed: 211 additions & 50 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: GCC
99
runs-on: ubuntu-24.04
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
with:
1313
submodules: true
1414
- run: source .github/ubuntu_deps.sh
@@ -25,7 +25,7 @@ jobs:
2525
name: Tarball
2626
runs-on: ubuntu-24.04
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
with:
3030
submodules: true
3131
- run: source .github/ubuntu_deps.sh
@@ -53,7 +53,7 @@ jobs:
5353
CXX: clang++
5454
CC: clang
5555
steps:
56-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@v5
5757
with:
5858
submodules: true
5959
- run: source .github/ubuntu_deps.sh
@@ -76,7 +76,7 @@ jobs:
7676
#CXXFLAGS: "-fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fPIE"
7777
#LDFLAGS: "-fsanitize=address -pie"
7878
#steps:
79-
#- uses: actions/checkout@v4
79+
#- uses: actions/checkout@v5
8080
#with:
8181
#submodules: true
8282
#- run: source .github/ubuntu_deps.sh
@@ -92,7 +92,7 @@ jobs:
9292
#CXXFLAGS: "-fsanitize=thread -O1 -fPIE"
9393
#LDFLAGS: "-fsanitize=thread"
9494
#steps:
95-
#- uses: actions/checkout@v4
95+
#- uses: actions/checkout@v5
9696
#with:
9797
#submodules: true
9898
#- run: source .github/ubuntu_deps.sh
@@ -114,7 +114,7 @@ jobs:
114114
CXX: clang++
115115
CC: clang
116116
steps:
117-
- uses: actions/checkout@v4
117+
- uses: actions/checkout@v5
118118
with:
119119
submodules: true
120120
- run: |
@@ -134,7 +134,7 @@ jobs:
134134
- tarball
135135
- clang
136136
steps:
137-
- uses: actions/checkout@v4
137+
- uses: actions/checkout@v5
138138
with:
139139
submodules: true
140140
- id: tagger
@@ -173,7 +173,7 @@ jobs:
173173
runs-on: ubuntu-latest
174174
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
175175
steps:
176-
- uses: actions/checkout@v4
176+
- uses: actions/checkout@v5
177177
with:
178178
submodules: true
179179
- run: sudo apt-get update

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
with:
3030
submodules: true
3131
- run: |

modules/po/cert.bg_BG.po

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ msgid ""
2424
"current certificate. Alternatively click {1} to delete your certificate."
2525
msgstr ""
2626
"Вече имате зададен сертификат, използвайте полето отдолу за да презапишете "
27-
"текущият сертификат. Като друга опция, натиснете {1} за да изтриете вашия "
28-
"сертификат."
27+
"текущия сертификат. Или натиснете {1} за да изтриете вашия сертификат."
2928

3029
#: modules/po/../data/cert/tmpl/index.tmpl:8
3130
msgid "You do not have a certificate yet."
@@ -49,7 +48,7 @@ msgstr "Pem файла е изтрит"
4948

5049
#: cert.cpp:31
5150
msgid "The pem file doesn't exist or there was a error deleting the pem file."
52-
msgstr "Pem файлът не съществува или има грешка в изтриването му."
51+
msgstr "Pem файла не съществува или има грешка в изтриването му."
5352

5453
#: cert.cpp:38
5554
#, c++-format
@@ -66,16 +65,16 @@ msgstr ""
6665
#: cert.cpp:44
6766
#, c++-format
6867
msgid "Alternatively you can place one at {1}"
69-
msgstr ""
68+
msgstr "Освен това може да сложите един в {1}"
7069

7170
#: cert.cpp:52
7271
msgid "Delete the current certificate"
7372
msgstr "Изтриване на текущия сертификат"
7473

7574
#: cert.cpp:54
7675
msgid "Show the current certificate"
77-
msgstr "Показва текущият сертификат"
76+
msgstr "Покажи текущия сертификат"
7877

7978
#: cert.cpp:105
8079
msgid "Use a ssl certificate to connect to a server"
81-
msgstr "Използване на SSL сертификат за да се свържите към сървър"
80+
msgstr "Използвай Ssl сертификат за свързване към сървър"

modules/po/certauth.bg_BG.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ msgstr ""
1414

1515
#: modules/po/../data/certauth/tmpl/index.tmpl:7
1616
msgid "Add a key"
17-
msgstr "Добавяне на ключ"
17+
msgstr "Добавете ключ"
1818

1919
#: modules/po/../data/certauth/tmpl/index.tmpl:11
2020
msgid "Key:"
2121
msgstr "Ключ:"
2222

2323
#: modules/po/../data/certauth/tmpl/index.tmpl:15
2424
msgid "Add Key"
25-
msgstr "Добавяне на ключ"
25+
msgstr "Добавете ключ"
2626

2727
#: modules/po/../data/certauth/tmpl/index.tmpl:23
2828
msgid "You have no keys."
@@ -53,15 +53,15 @@ msgstr "id"
5353

5454
#: certauth.cpp:35
5555
msgid "Delete a key by its number in List"
56-
msgstr "Изтрива ключ по номера му в списъка"
56+
msgstr "Изтрий ключ по номера му в списъка"
5757

5858
#: certauth.cpp:37
5959
msgid "List your public keys"
6060
msgstr "Показва вашите публични ключове"
6161

6262
#: certauth.cpp:39
6363
msgid "Print your current key"
64-
msgstr "Изкарва вашият текущ ключ"
64+
msgstr "Принтирайте вашия текущ ключ"
6565

6666
#: certauth.cpp:239
6767
msgid "You are not connected with any valid public key"
@@ -74,12 +74,12 @@ msgstr "Вашият публичен ключ: {1}"
7474

7575
#: certauth.cpp:254
7676
msgid "You did not supply a public key or connect with one."
77-
msgstr "Вие не сте определили публичен ключ, или не сте се свързали с такъв."
77+
msgstr "Не сте определили публичен ключ, или не сте се свързали с такъв."
7878

7979
#: certauth.cpp:257
8080
#, c++-format
8181
msgid "Key '{1}' added."
82-
msgstr "Ключ '{1}' е добавен."
82+
msgstr "Ключът '{1}' е добавен."
8383

8484
#: certauth.cpp:259
8585
#, c++-format

0 commit comments

Comments
 (0)