[onboard] 01/01: Add two patches from Ubuntu
Jeremy Bicha
jbicha-guest at moszumanska.debian.org
Wed Aug 3 22:01:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
jbicha-guest pushed a commit to branch master
in repository onboard.
commit 33fe5afe8f6cfd42e3e636f6bdc91dcca06305d1
Author: Jeremy Bicha <jbicha at ubuntu.com>
Date: Wed Aug 3 17:56:14 2016 -0400
Add two patches from Ubuntu
* debian/patches/0004_fix_arrows_on_compact_layout.patch:
- Fix "show more suggestions arrow" in compact layout
* debian/patches/0005_bzr_fix_untranslatable_buttons.patch:
- Make former stock buttons in preferences translatable
---
.../0004_fix_arrows_on_compact_layout.patch | 117 +++++++++++++++++
.../0005_bzr_fix_untranslatable_buttons.patch | 139 +++++++++++++++++++++
debian/patches/series | 2 +
3 files changed, 258 insertions(+)
diff --git a/debian/patches/0004_fix_arrows_on_compact_layout.patch b/debian/patches/0004_fix_arrows_on_compact_layout.patch
new file mode 100644
index 0000000..a28f571
--- /dev/null
+++ b/debian/patches/0004_fix_arrows_on_compact_layout.patch
@@ -0,0 +1,117 @@
+Origin: https://bazaar.launchpad.net/~onboard/onboard/trunk/revision/2110
+Bug: https://launchpad.net/bugs/1550534
+Index: onboard-1.2.0/layouts/Compact-Alpha.svg
+===================================================================
+--- onboard-1.2.0.orig/layouts/Compact-Alpha.svg 2016-02-18 14:31:51.000000000 +0100
++++ onboard-1.2.0/layouts/Compact-Alpha.svg 2016-02-26 12:16:55.040434465 +0100
+@@ -89,32 +89,32 @@
+ </metadata>
+ <rect
+ id="wordlist"
+- height="14.733308"
++ height="15.028312"
+ width="306.52832"
+- y="4.7904754"
++ y="4.4858437"
+ x="0.48584402"
+ style="fill:#151530;stroke:#7f7f7f;stroke-width:0.97168803;stroke-miterlimit:4;stroke-dasharray:none" />
+ <rect
+ id="prediction"
+- height="14.707282"
++ height="15"
+ width="49"
+- y="4.8034878"
+- x="110.5"
+- style="color:#000000;fill:#2b2b63;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
++ y="4.5"
++ x="71.5"
++ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2b2b63;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <rect
+ id="correction"
+- height="14.707282"
++ height="15"
+ width="49"
+- y="4.8034878"
+- x="30.5"
+- style="color:#000000;fill:#2b2b63;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
++ y="4.5"
++ x="1.5"
++ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2b2b63;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ inkscape:label="#correction" />
+ <rect
+ id="expand-corrections"
+- height="14.707282"
+- width="17.272728"
+- y="4.8034878"
+- x="85.657127"
++ height="14.685742"
++ width="16.685743"
++ y="4.6571288"
++ x="52.657127"
+ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:1.3142575;stroke-miterlimit:4;stroke-dasharray:none" />
+ <rect
+ id="AB01"
+@@ -711,21 +711,21 @@
+ id="layer2.wordlist"
+ inkscape:label="" />
+ <rect
+- style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
++ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none"
+ x="285.5"
+- y="4.8034878"
+- width="18"
+- height="14.707282"
++ y="4.5"
++ width="17"
++ height="15"
+ id="hide.wordlist"
+ inkscape:label="" />
+ <rect
+ inkscape:label=""
+ id="language.wordlist"
+- height="14.707282"
+- width="18"
+- y="4.8034878"
++ height="15"
++ width="17"
++ y="4.5"
+ x="265.5"
+- style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" />
++ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
+ <g
+ id="RTRN">
+ <path
+@@ -744,11 +744,27 @@
+ inkscape:label="#RTRN_50pct" />
+ </g>
+ <rect
+- style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+- x="245.5"
+- y="4.8034878"
+- width="18"
+- height="14.707282"
+- id="pause-learning.wordlist"
++ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none"
++ x="225.5"
++ y="4.5"
++ width="17"
++ height="15"
++ id="next-predictions.wordlist"
+ inkscape:label="" />
++ <rect
++ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none"
++ x="205.5"
++ y="4.5"
++ width="17"
++ height="15"
++ id="previous-predictions.wordlist"
++ inkscape:label="" />
++ <rect
++ inkscape:label=""
++ id="pause-learning.wordlist"
++ height="15"
++ width="17"
++ y="4.5"
++ x="245.5"
++ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
+ </svg>
diff --git a/debian/patches/0005_bzr_fix_untranslatable_buttons.patch b/debian/patches/0005_bzr_fix_untranslatable_buttons.patch
new file mode 100644
index 0000000..ce7b47a
--- /dev/null
+++ b/debian/patches/0005_bzr_fix_untranslatable_buttons.patch
@@ -0,0 +1,139 @@
+Origin: https://bazaar.launchpad.net/~onboard/onboard/trunk/revision/2129
+Bug: https://launchpad.net/bugs/1567301
+Index: onboard-1.2.0/settings.ui
+===================================================================
+--- onboard-1.2.0.orig/settings.ui 2016-02-18 14:31:51.000000000 +0100
++++ onboard-1.2.0/settings.ui 2016-04-15 21:27:35.187583393 +0200
+@@ -273,7 +273,7 @@
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="close_button">
+- <property name="label">_Close</property>
++ <property name="label" translatable="yes">_Close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+@@ -1458,7 +1458,7 @@
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="layout_new_button">
+- <property name="label">_New</property>
++ <property name="label" translatable="yes">_New</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+@@ -1473,7 +1473,7 @@
+ </child>
+ <child>
+ <object class="GtkButton" id="layout_remove_button">
+- <property name="label">_Delete</property>
++ <property name="label" translatable="yes">_Delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+@@ -1503,7 +1503,7 @@
+ </child>
+ <child>
+ <object class="GtkButton" id="layout_about_button">
+- <property name="label">_About</property>
++ <property name="label" translatable="yes">_About</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+@@ -1613,7 +1613,7 @@
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="new_theme_button">
+- <property name="label">_New</property>
++ <property name="label" translatable="yes">_New</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+@@ -1628,7 +1628,7 @@
+ </child>
+ <child>
+ <object class="GtkButton" id="delete_theme_button">
+- <property name="label">_Delete</property>
++ <property name="label" translatable="yes">_Delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+@@ -1777,7 +1777,7 @@
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="snippet_add_button">
+- <property name="label">_Add</property>
++ <property name="label" translatable="yes">_Add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+@@ -1792,7 +1792,7 @@
+ </child>
+ <child>
+ <object class="GtkButton" id="snippet_remove_button">
+- <property name="label">_Remove</property>
++ <property name="label" translatable="yes">_Remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+Index: onboard-1.2.0/settings_auto_show_dialog.ui
+===================================================================
+--- onboard-1.2.0.orig/settings_auto_show_dialog.ui 2016-02-18 14:31:51.000000000 +0100
++++ onboard-1.2.0/settings_auto_show_dialog.ui 2016-04-15 21:32:07.251576063 +0200
+@@ -81,7 +81,7 @@
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="dialog_close_button">
+- <property name="label">_Close</property>
++ <property name="label" translatable="yes">_Close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+Index: onboard-1.2.0/settings_docking_dialog.ui
+===================================================================
+--- onboard-1.2.0.orig/settings_docking_dialog.ui 2016-02-18 14:31:51.000000000 +0100
++++ onboard-1.2.0/settings_docking_dialog.ui 2016-04-15 21:35:13.779571038 +0200
+@@ -89,7 +89,7 @@
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="dialog_close_button">
+- <property name="label">_Close</property>
++ <property name="label" translatable="yes">_Close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+Index: onboard-1.2.0/settings_scanner_dialog.ui
+===================================================================
+--- onboard-1.2.0.orig/settings_scanner_dialog.ui 2016-02-18 14:31:51.000000000 +0100
++++ onboard-1.2.0/settings_scanner_dialog.ui 2016-04-15 21:37:55.915566670 +0200
+@@ -92,7 +92,7 @@
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="dialog_close_button">
+- <property name="label">_Close</property>
++ <property name="label" translatable="yes">_Close</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+Index: onboard-1.2.0/settings_theme_dialog.ui
+===================================================================
+--- onboard-1.2.0.orig/settings_theme_dialog.ui 2016-02-18 14:31:51.000000000 +0100
++++ onboard-1.2.0/settings_theme_dialog.ui 2016-04-15 21:51:52.055544142 +0200
+@@ -989,7 +989,7 @@
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="revert_button">
+- <property name="label">_Revert</property>
++ <property name="label" translatable="yes">_Revert</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+@@ -1004,7 +1004,7 @@
+ </child>
+ <child>
+ <object class="GtkButton" id="close_button">
+- <property name="label">_Close</property>
++ <property name="label" translatable="yes">_Close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
diff --git a/debian/patches/series b/debian/patches/series
index 8dabae1..2330123 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
0001_make-desktop-files-appropriate-for-Debian.patch
0002_build-with-gcc6.patch
0003_bump-gnome-shell-compatibility.patch
+0004_fix_arrows_on_compact_layout.patch
+0005_bzr_fix_untranslatable_buttons.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/onboard.git
More information about the pkg-mate-commits
mailing list