maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gtk-ui: string and style changes

Browse source
This commit is contained in:
Jussi Kukkonen 2010-01-26 13:43:37 +02:00 committed by Patrick Ohly
parent a111d86ff1
commit 322fe10b2a
2 changed files with 197 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gtk-ui/sync-ui.c
View file

@ -1287,16 +1287,15 @@ update_emergency_view (app_data *data)
/* TRANSLATORS: this is an explanation in Emergency view.
* Placeholder is a service/device name */
_("A normal sync with %s is not possible at this time."
"We can do a slow two-way sync, start from scratch or "
"You can do a slow two-way sync, start from scratch or "
"restore from backup."),
data->current_service->name);
} else {
/* TRANSLATORS: this is an explanation in Emergency view.
* Placeholder is a service/device name */
text = g_strdup_printf (
_("If something has gone horribly wrong with %s, we can try a "
"slow sync, start from scratch or restore from backup."),
data->current_service->name);
_("If something has gone horribly wrong, you can try a "
"slow sync, start from scratch or restore from backup."));
}
gtk_label_set_text (GTK_LABEL (data->emergency_label), text);
g_free (text);

45
src/gtk-ui/ui.glade
View file

@ -371,6 +371,17 @@
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
<widget class="GtkLabel" id="action_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" comments="title for the buttons on the right side of main view">&lt;b&gt;Actions&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="sync_btn">
<property name="label">Sync now</property>
@ -380,7 +391,7 @@
</widget>
<packing>
<property name="fill">False</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
<child>
@ -399,7 +410,7 @@ sync service</property>
</widget>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
<child>
@ -413,7 +424,7 @@ emergency</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
<property name="position">3</property>
</packing>
</child>
</widget>
@ -788,7 +799,7 @@ you can setup a service manually.</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label19">
<widget class="GtkLabel" id="slow_sync_explanation_label">
<property name="visible">True</property>
<property name="xpad">8</property>
<property name="label" translatable="yes">A slow sync compares items from both sides and tries to merge them.
@ -859,7 +870,8 @@ with data from Zyb</property>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xpad">15</property>
<property name="label" translatable="yes" comments="text between the two &quot;start from scratch&quot; buttons in emergency view">or</property>
<property name="label" translatable="yes" comments="text between the two &quot;start from scratch&quot; buttons in emergency view">&lt;b&gt;or&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="expand">False</property>
@ -918,6 +930,24 @@ local information</property>
<property name="visible">True</property>
<property name="left_padding">40</property>
<property name="right_padding">200</property>
<child>
<widget class="GtkVBox" id="vbox22">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<widget class="GtkLabel" id="label12">
<property name="width_request">760</property>
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" comments="explanation of &quot;Restore backup&quot; function">Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost.</property>
<property name="wrap">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
@ -1087,6 +1117,11 @@ local information</property>
</widget>
</child>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
</child>
</widget>
<packing>