Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-client-gnome
Commits
576bfb0e
Commit
576bfb0e
authored
Sep 04, 2018
by
Vladimir Stoiakin
Committed by
Adrien Béraud
Sep 04, 2018
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace triple dots with U+2026 in the sources
Change-Id: I2a1a7efbca20b191d6db5891de8f57b4aff05fbb
parent
8bc5658f
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
14 deletions
+14
-14
src/accountgeneraltab.cpp
src/accountgeneraltab.cpp
+1
-1
src/dialogs.c
src/dialogs.c
+1
-1
src/native/dbuserrorhandler.cpp
src/native/dbuserrorhandler.cpp
+1
-1
src/newaccountsettingsview.cpp
src/newaccountsettingsview.cpp
+2
-2
src/ringmainwindow.cpp
src/ringmainwindow.cpp
+1
-1
src/usernameregistrationbox.cpp
src/usernameregistrationbox.cpp
+2
-2
ui/accountcreationwizard.ui
ui/accountcreationwizard.ui
+4
-4
ui/incomingcallview.ui
ui/incomingcallview.ui
+1
-1
ui/newaccountsettingsview.ui
ui/newaccountsettingsview.ui
+1
-1
No files found.
src/accountgeneraltab.cpp
View file @
576bfb0e
...
...
@@ -654,7 +654,7 @@ build_tab_view(AccountGeneralTab *view)
gtk_grid_attach
(
GTK_GRID
(
priv
->
grid_account
),
label
,
0
,
grid_row
,
1
,
1
);
entry_username
=
gtk_entry_new
();
gtk_widget_set_halign
(
entry_username
,
GTK_ALIGN_START
);
gtk_entry_set_placeholder_text
(
GTK_ENTRY
(
entry_username
),
_
(
"auto-generating
...
"
));
gtk_entry_set_placeholder_text
(
GTK_ENTRY
(
entry_username
),
_
(
"auto-generating
…
"
));
gtk_entry_set_text
(
GTK_ENTRY
(
entry_username
),
priv
->
account
->
username
().
toLocal8Bit
().
constData
());
g_object_set
(
G_OBJECT
(
entry_username
),
"editable"
,
FALSE
,
NULL
);
g_object_set
(
G_OBJECT
(
entry_username
),
"max-width-chars"
,
50
,
NULL
);
...
...
src/dialogs.c
View file @
576bfb0e
...
...
@@ -50,7 +50,7 @@ ring_dialog_working(GtkWidget *parent, const gchar *msg)
if
(
msg
)
{
message
=
gtk_label_new
(
msg
);
}
else
{
message
=
gtk_label_new
(
_
(
"Working
...
"
));
message
=
gtk_label_new
(
_
(
"Working
…
"
));
}
gtk_box_pack_start
(
GTK_BOX
(
content_area
),
message
,
FALSE
,
TRUE
,
0
);
...
...
src/native/dbuserrorhandler.cpp
View file @
576bfb0e
...
...
@@ -54,7 +54,7 @@ dring_crash_dialog()
gtk_widget_set_margin_top
(
content_area
,
25
);
auto
message
=
gtk_label_new
(
_
(
"Trying to reconnect to the Ring daemon (dring)
...
"
)
_
(
"Trying to reconnect to the Ring daemon (dring)
…
"
)
);
gtk_box_pack_start
(
GTK_BOX
(
content_area
),
message
,
FALSE
,
TRUE
,
0
);
...
...
src/newaccountsettingsview.cpp
View file @
576bfb0e
...
...
@@ -1959,13 +1959,13 @@ new_account_settings_view_update(NewAccountSettingsView *view, gboolean reset_vi
switch
((
*
priv
->
accountInfo_
)
->
status
)
{
case
lrc
::
api
::
account
::
Status
::
INITIALIZING
:
gtk_label_set_text
(
GTK_LABEL
(
label_status
),
_
(
"Initializing
...
"
));
gtk_label_set_text
(
GTK_LABEL
(
label_status
),
_
(
"Initializing
…
"
));
break
;
case
lrc
::
api
::
account
::
Status
::
UNREGISTERED
:
gtk_label_set_text
(
GTK_LABEL
(
label_status
),
_
(
"Offline"
));
break
;
case
lrc
::
api
::
account
::
Status
::
TRYING
:
gtk_label_set_text
(
GTK_LABEL
(
label_status
),
_
(
"Connecting
...
"
));
gtk_label_set_text
(
GTK_LABEL
(
label_status
),
_
(
"Connecting
…
"
));
break
;
case
lrc
::
api
::
account
::
Status
::
REGISTERED
:
gtk_label_set_text
(
GTK_LABEL
(
label_status
),
_
(
"Online"
));
...
...
src/ringmainwindow.cpp
View file @
576bfb0e
...
...
@@ -172,7 +172,7 @@ print_account_and_state(GtkCellLayout* cell_layout,
if
(
g_strcmp0
(
""
,
id
)
==
0
)
{
text
=
g_markup_printf_escaped
(
"<span font=
\"
10
\"
>%s</span>"
,
_
(
"Add account
...
"
)
_
(
"Add account
…
"
)
);
}
else
if
(
g_strcmp0
(
""
,
registeredName
)
==
0
)
{
if
(
g_strcmp0
(
uri
,
alias
)
==
0
)
{
...
...
src/usernameregistrationbox.cpp
View file @
576bfb0e
...
...
@@ -271,7 +271,7 @@ entry_username_changed(UsernameRegistrationBox *view)
if
(
priv
->
use_blockchain
)
{
show_error
(
view
,
false
,
_
(
"Performing lookup
...
"
));
show_error
(
view
,
false
,
_
(
"Performing lookup
…
"
));
if
(
strlen
(
username
)
==
0
)
{
gtk_widget_hide
(
priv
->
spinner
);
gtk_spinner_stop
(
GTK_SPINNER
(
priv
->
spinner
));
...
...
@@ -341,7 +341,7 @@ button_register_username_clicked(G_GNUC_UNUSED GtkButton* button, UsernameRegist
gtk_widget_set_sensitive
(
priv
->
entry_username
,
TRUE
);
gtk_widget_set_sensitive
(
priv
->
button_register_username
,
TRUE
);
show_error
(
view
,
false
,
_
(
"Registration in progress
...
"
));
show_error
(
view
,
false
,
_
(
"Registration in progress
…
"
));
}
break
;
}
...
...
ui/accountcreationwizard.ui
View file @
576bfb0e
...
...
@@ -83,7 +83,7 @@
</child>
<child>
<object
class=
"GtkButton"
id=
"button_show_advanced"
>
<property
name=
"label"
translatable=
"yes"
>
Advanced
...
</property>
<property
name=
"label"
translatable=
"yes"
>
Advanced
…
</property>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
<style>
...
...
@@ -563,7 +563,7 @@
<object
class=
"GtkLabel"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Generating your Ring account
...
</property>
<property
name=
"label"
translatable=
"yes"
>
Generating your Ring account
…
</property>
</object>
</child>
<child>
...
...
@@ -589,7 +589,7 @@
<object
class=
"GtkLabel"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Registering username
...
</property>
<property
name=
"label"
translatable=
"yes"
>
Registering username
…
</property>
</object>
</child>
<child>
...
...
@@ -622,7 +622,7 @@
<object
class=
"GtkLabel"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Retrieving your Ring account
...
</property>
<property
name=
"label"
translatable=
"yes"
>
Retrieving your Ring account
…
</property>
</object>
</child>
<child>
...
...
ui/incomingcallview.ui
View file @
576bfb0e
...
...
@@ -96,7 +96,7 @@
<object
class=
"GtkLabel"
id=
"label_status"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Incoming
...
</property>
<property
name=
"label"
translatable=
"yes"
>
Incoming
…
</property>
<property
name=
"ellipsize"
>
end
</property>
<style>
<class
name=
"dim-label"
/>
...
...
ui/newaccountsettingsview.ui
View file @
576bfb0e
...
...
@@ -207,7 +207,7 @@
<object
class=
"GtkLabel"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Exporting account on the Ring
...
</property>
<property
name=
"label"
translatable=
"yes"
>
Exporting account on the Ring
…
</property>
</object>
</child>
<child>
...
...
Hugo Lefeuvre
@hlefeuvre
mentioned in issue
ring-project#505 (closed)
·
Sep 30, 2018
mentioned in issue
ring-project#505 (closed)
mentioned in issue ring-project#505
Toggle commit list
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