Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
kaidan
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Robert Maerkisch
kaidan
Commits
5f89028c
Commit
5f89028c
authored
Mar 24, 2018
by
Allan Nordhøy
Committed by
Linus Jahn
Mar 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spelling: because not → as a result of not (#223)
parent
e454ecf4
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
142 additions
and
36 deletions
+142
-36
i18n/base.ts
i18n/base.ts
+10
-3
i18n/de.ts
i18n/de.ts
+22
-3
i18n/es.ts
i18n/es.ts
+22
-3
i18n/fr.ts
i18n/fr.ts
+10
-3
i18n/ja.ts
i18n/ja.ts
+10
-3
i18n/ms.ts
i18n/ms.ts
+10
-3
i18n/nb.ts
i18n/nb.ts
+22
-3
i18n/nl.ts
i18n/nl.ts
+10
-3
i18n/pt.ts
i18n/pt.ts
+10
-3
i18n/ru.ts
i18n/ru.ts
+10
-3
src/Kaidan.cpp
src/Kaidan.cpp
+6
-6
No files found.
i18n/base.ts
View file @
5f89028c
...
...
@@ -62,15 +62,15 @@
<
context
>
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
...
...
@@ -210,4 +210,11 @@
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
/TS
>
i18n/de.ts
View file @
5f89028c
...
...
@@ -113,15 +113,27 @@
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
translation
>
Die
Nachricht
konnte
nicht
gesendet
werden
,
da
Sie
nicht
verbunden
sind
.
<
/translation
>
<
translation
type
=
"
vanished
"
>
Die
Nachricht
konnte
nicht
gesendet
werden
,
da
Sie
nicht
verbunden
sind
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
translation
>
Der
Kontakt
konnte
nicht
hinzugefügt
werden
,
da
Sie
nicht
verbunden
sind
.
<
/translation
>
<
translation
type
=
"
vanished
"
>
Der
Kontakt
konnte
nicht
hinzugefügt
werden
,
da
Sie
nicht
verbunden
sind
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
translation
>
Der
Kontakt
konnte
nicht
entfernt
werden
,
da
Sie
nicht
verbunden
sind
.
<
/translation
>
<
translation
type
=
"
vanished
"
>
Der
Kontakt
konnte
nicht
entfernt
werden
,
da
Sie
nicht
verbunden
sind
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
...
...
@@ -272,6 +284,13 @@
<
translation
>
Möchten
Sie
wirklich
&
lt
;
%
1
&
gt
;
aus
Ihrer
Kontaktliste
entfernen
?
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
main
<
/name
>
<
message
>
...
...
i18n/es.ts
View file @
5f89028c
...
...
@@ -82,15 +82,27 @@
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
translation
>
No
se
pudo
enviar
el
mensaje
porque
no
está
conectado
.
<
/translation
>
<
translation
type
=
"
vanished
"
>
No
se
pudo
enviar
el
mensaje
porque
no
está
conectado
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
translation
>
No
se
pudo
añadir
el
contacto
porque
no
está
conectado
.
<
/translation
>
<
translation
type
=
"
vanished
"
>
No
se
pudo
añadir
el
contacto
porque
no
está
conectado
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
translation
>
No
se
pudo
eliminar
el
contacto
porque
no
está
conectado
.
<
/translation
>
<
translation
type
=
"
vanished
"
>
No
se
pudo
eliminar
el
contacto
porque
no
está
conectado
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
...
...
@@ -237,4 +249,11 @@
<
translation
>
¿
Realmente
desea
borrar
el
contacto
&
lt
;
%
1
&
gt
;
de
su
lista
?
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
/TS
>
i18n/fr.ts
View file @
5f89028c
...
...
@@ -104,15 +104,15 @@
<
context
>
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
...
...
@@ -260,4 +260,11 @@
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
/TS
>
i18n/ja.ts
View file @
5f89028c
...
...
@@ -81,15 +81,15 @@
<
context
>
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
...
...
@@ -233,4 +233,11 @@
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
/TS
>
i18n/ms.ts
View file @
5f89028c
...
...
@@ -104,15 +104,15 @@
<
context
>
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
...
...
@@ -264,4 +264,11 @@
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
/TS
>
i18n/nb.ts
View file @
5f89028c
...
...
@@ -82,15 +82,27 @@
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
>
Kunne
ikke
sende
melding
,
som
følge
av
manglende
tilkobling
.
<
/translation
>
<
translation
type
=
"
obsolete
"
>
Kunne
ikke
sende
melding
,
som
følge
av
manglende
tilkobling
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
>
Kunne
ikke
legge
til
kontakt
,
som
følge
av
manglende
tilkobling
.
<
/translation
>
<
translation
type
=
"
obsolete
"
>
Kunne
ikke
legge
til
kontakt
,
som
følge
av
manglende
tilkobling
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
>
Kunne
ikke
fjerne
kontakt
,
som
følge
av
manglende
tilkobling
.
<
/translation
>
<
translation
type
=
"
obsolete
"
>
Kunne
ikke
fjerne
kontakt
,
som
følge
av
manglende
tilkobling
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
...
...
@@ -237,4 +249,11 @@
<
translation
>
Ønsker
du
virkelig
å
slette
kontakten
&
lt
;
%
1
&
gt
;
fra
din
kontaktliste
?
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
/TS
>
i18n/nl.ts
View file @
5f89028c
...
...
@@ -81,15 +81,15 @@
<
context
>
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
...
...
@@ -241,4 +241,11 @@
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
/TS
>
i18n/pt.ts
View file @
5f89028c
...
...
@@ -81,15 +81,15 @@
<
context
>
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
...
...
@@ -229,4 +229,11 @@
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
/TS
>
i18n/ru.ts
View file @
5f89028c
...
...
@@ -108,15 +108,15 @@
<
context
>
<
name
>
Kaidan
<
/name
>
<
message
>
<
source
>
Could
not
send
message
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
send
message
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
add
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
add
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
Could
not
remove
contact
,
because
not
being
connected
.
<
/source
>
<
source
>
Could
not
remove
contact
,
as
a
result
of
not
being
connected
.
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
...
...
@@ -268,6 +268,13 @@
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ToolBarApplicationHeader
<
/name
>
<
message
>
<
source
>
More
Actions
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
main
<
/name
>
<
message
>
...
...
src/Kaidan.cpp
View file @
5f89028c
...
...
@@ -189,8 +189,8 @@ void Kaidan::sendMessage(QString jid, QString message)
if
(
client
->
isConnected
())
{
emit
client
->
sendMessageRequested
(
jid
,
message
);
}
else
{
emit
passiveNotificationRequested
(
tr
(
"Could not send message,
because
not being connected."
));
qWarning
()
<<
"[main] Could not send message,
because
not being connected."
;
emit
passiveNotificationRequested
(
tr
(
"Could not send message,
as a result of
not being connected."
));
qWarning
()
<<
"[main] Could not send message,
as a result of
not being connected."
;
}
}
...
...
@@ -199,8 +199,8 @@ void Kaidan::addContact(QString jid, QString nick)
if
(
client
->
isConnected
())
{
emit
client
->
addContactRequested
(
jid
,
nick
);
}
else
{
emit
passiveNotificationRequested
(
tr
(
"Could not add contact,
because
not being connected."
));
qWarning
()
<<
"[main] Could not add contact,
because
not being connected."
;
emit
passiveNotificationRequested
(
tr
(
"Could not add contact,
as a result of
not being connected."
));
qWarning
()
<<
"[main] Could not add contact,
as a result of
not being connected."
;
}
}
...
...
@@ -209,8 +209,8 @@ void Kaidan::removeContact(QString jid)
if
(
client
->
isConnected
())
{
emit
client
->
removeContactRequested
(
jid
);
}
else
{
emit
passiveNotificationRequested
(
tr
(
"Could not remove contact,
because
not being connected."
));
qWarning
()
<<
"[main] Could not remove contact,
because
not being connected."
;
emit
passiveNotificationRequested
(
tr
(
"Could not remove contact,
as a result of
not being connected."
));
qWarning
()
<<
"[main] Could not remove contact,
as a result of
not being connected."
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment