Re: [Libreoffice] [PATCH] Unify Display Grid/ Grid Visible and other menu items
I would like to integrate this patch. Is it the final version and are all parties happy with it? F. On Fri, 2011-05-06 at 16:43 +, Christian Dywan wrote: Am 06.05.2011 18:39:40 schrieb Regina Henschel: Hi Christian, part --- a/sd/source/ui/dlg/tpoption.src +++ b/sd/source/ui/dlg/tpoption.src @@ -57,7 +57,7 @@ TabPage TP_OPTIONS_CONTENTS Pos = MAP_APPFONT ( 12 , 97 - 69 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = ~Guides when moving ; + Text [ en-US ] = ~Snap Lines when moving ; }; CheckBox CBX_HANDLES_BEZIER { seems to be wrong. Fixed, thanks a lot for your review. Do you have used UTF8 encoding? The binfilter parts, which still contain a lot of languages, come with wrong characters here. Or is it a problem of my editor? I'm seeing the same garbled characters, I don't know why since I always use UTF-8 locale... it shouldn't be a problem in any case since I'm only changing English strings. ciao, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Patch] Unify Display Grid/ Grid Visible and other menu items
So I was originally looking at a drawing bug and became puzzled because various context menu items have different labels than the exact same commands in the menubar and toolbar ¹. So I ended up fixing the labels of the following items: Visible Grid → Display Grid Snap Lines Visible → Display Guides Snap to Snap Lines → Snap to Guides Numbering/Bullets → Bullets and Numbering... Case/Characters → Change Case I tried to make sure I replaced it everywhere, including docs. Apologies for this being a diff, but it touches lots of different sub repositories... ¹ Apparently the de_DE locale solved this individually so I never saw it in the past. ciao, Christiandiff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index 91ece56..fa9a9df 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -363,7 +363,7 @@ Resource RID_GLOBSTR }; String STR_UNDO_TRANSLITERATE { -Text [ en-US ] = Case/Characters; +Text [ en-US ] = ~Change Case; }; String STR_DB_NONAME { diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.src b/binfilter/bf_svx/source/editeng/svx_editeng.src index 6172e44..b204c20 100644 --- a/binfilter/bf_svx/source/editeng/svx_editeng.src +++ b/binfilter/bf_svx/source/editeng/svx_editeng.src @@ -264,7 +264,7 @@ String RID_EDITUNDO_SETSTYLE String RID_EDITUNDO_TRANSLITERATE { Text [ de ] = GroÃ-/Kleinschreibung; -Text [ en-US ] = Case/Characters; +Text [ en-US ] = ~Change Case; Text [ x-comment ] = ; nk03.04.01: hier passt Englisch Uebesetzung besser.; Text[ pt ] = Caixa/Caracteres; Text[ ru ] = РегиÑÑÑ; diff --git a/binfilter/bf_sw/source/ui/inc/swmn.hrc b/binfilter/bf_sw/source/ui/inc/swmn.hrc index 28a768f..51b51a1 100644 --- a/binfilter/bf_sw/source/ui/inc/swmn.hrc +++ b/binfilter/bf_sw/source/ui/inc/swmn.hrc @@ -190,7 +190,7 @@ HelpID = FN_NUMBER_BULLETS ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Numerierung/Aufzählung... : ~Numerierung/Aufzõhlung... */\ Text [ de ] = ~Nummerierung/Aufzählung... ; \ -Text [ en-US ] = ~Numbering/Bullets... ; \ +Text [ en-US ] = ~Bullets and Numbering... ; \ Text [ x-comment ] = ;\ Text[ pt ] = ~Marcas/Numeração...;\ Text[ ru ] = ÐÑмеÑаÑиÑ/маÑкиÑовка...;\ diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src index 1c5d170..e1b8937 100644 --- a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src +++ b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src @@ -1690,7 +1690,7 @@ String STR_MERGE_TABLE String STR_TRANSLITERATE { Text [ de ] = GroÃ-/Kleinschreibung ; -Text [ en-US ] = Case/Characters; +Text [ en-US ] = ~Change Case; Text[ pt ] = Caixa/Caracteres; Text[ ru ] = ÑегиÑÑÑ; Text[ el ] = ÎεÏαλαία/Πεζά; diff --git a/binfilter/inc/bf_svx/globlmn.hrc b/binfilter/inc/bf_svx/globlmn.hrc index 6edca72..c3a6445 100644 --- a/binfilter/inc/bf_svx/globlmn.hrc +++ b/binfilter/inc/bf_svx/globlmn.hrc @@ -3757,7 +3757,7 @@ Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ HelpID = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ Text [ de ] = ~Nummerierung/Aufzählung... ; \ -Text [ en-US ] = ~Numbering/Bullets... ; \ +Text [ en-US ] = ~Bullets and Numbering... ; \ Text [ x-comment ] = ;\ Text[ pt ] = ~Marcas/Numeração...;\ Text[ ru ] = ÐÑмеÑаÑиÑ/маÑкиÑовка...;\ @@ -5479,7 +5479,7 @@ };\ };\ };\ -Text [ en-US ] = Case/Characters;\ +Text [ en-US ] = ~Change Case;\ Text [ x-comment ] = nk03.04.01: hier passt Englisch Uebesetzung besser.;\ Text[ pt ] = Caixa/Caracteres;\ Text[ ru ] = РегиÑÑÑ;\ diff --git a/helpcontent2/source/text/shared/00/00040500.xhp b/helpcontent2/source/text/shared/00/00040500.xhp index cda7d90..43a3e91 100644 --- a/helpcontent2/source/text/shared/00/00040500.xhp +++ b/helpcontent2/source/text/shared/00/00040500.xhp @@ -322,7 +322,7 @@ section id=grossklein paragraph xml-lang=en-US id=par_id3151254 role=paragraph l10n=CHG oldref=195Choose emphFormat - Change Case/emph /paragraph - paragraph xml-lang=en-US id=par_id3159624 role=paragraph l10n=U oldref=196Open context menu (text) - choose emphCase/Characters/emph + paragraph xml-lang=en-US id=par_id3159624 role=paragraph l10n=U oldref=196Open context menu (text) - choose emph~Change Case/emph /paragraph /section section id=ruby diff --git a/helpcontent2/source/text/shared/01/0505.xhp b/helpcontent2/source/text/shared/01/0505.xhp index 4526e65..91a8705 100644 --- a/helpcontent2/source/text/shared/01/0505.xhp +++ b/helpcontent2/source/text/shared/01/0505.xhp @@ -38,7 +38,7 @@ body section id=grossklein bookmark xml-lang=en-US branch=hid/.uno:TransliterateMenu
Re: [Libreoffice] [Patch] Unify Display Grid/ Grid Visible and other menu items
Hi Christian, I'm not sure about the changes. 'Snap Lines' is a better term than 'Guides'. The German term 'Fanglinien' describes it functionality, so does 'Snap Lines'. 'Guide' is not specific. It can be 'Snap Line' but also 'Helpline'. kind regards Regina Christian Dywan schrieb: So I was originally looking at a drawing bug and became puzzled because various context menu items have different labels than the exact same commands in the menubar and toolbar ¹. So I ended up fixing the labels of the following items: Visible Grid → Display Grid Snap Lines Visible → Display Guides Snap to Snap Lines → Snap to Guides Numbering/Bullets → Bullets and Numbering... Case/Characters → Change Case I tried to make sure I replaced it everywhere, including docs. Apologies for this being a diff, but it touches lots of different sub repositories... ¹ Apparently the de_DE locale solved this individually so I never saw it in the past. ciao, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Patch] Unify Display Grid/ Grid Visible and other menu items
Am 06.05.2011 15:29:16 schrieb Regina Henschel: Hi Christian, I'm not sure about the changes. 'Snap Lines' is a better term than 'Guides'. The German term 'Fanglinien' describes it functionality, so does 'Snap Lines'. 'Guide' is not specific. It can be 'Snap Line' but also 'Helpline'. kind regards Regina Attached an updated patch, I missed the main menu item Guides/ Snap Lines before. The patch doesn't change any wording, strictly speaking, but it unifies the labels. The existence of conflicting terms hurts usability. I don't have a strong opinion on Guide versus Snap Line, both make sense to me, except it feels a bit redundant to talk about snapping to snap lines.diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index 91ece56..fa9a9df 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -363,7 +363,7 @@ Resource RID_GLOBSTR }; String STR_UNDO_TRANSLITERATE { -Text [ en-US ] = Case/Characters; +Text [ en-US ] = ~Change Case; }; String STR_DB_NONAME { diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.src b/binfilter/bf_svx/source/editeng/svx_editeng.src index 6172e44..b204c20 100644 --- a/binfilter/bf_svx/source/editeng/svx_editeng.src +++ b/binfilter/bf_svx/source/editeng/svx_editeng.src @@ -264,7 +264,7 @@ String RID_EDITUNDO_SETSTYLE String RID_EDITUNDO_TRANSLITERATE { Text [ de ] = GroÃ-/Kleinschreibung; -Text [ en-US ] = Case/Characters; +Text [ en-US ] = ~Change Case; Text [ x-comment ] = ; nk03.04.01: hier passt Englisch Uebesetzung besser.; Text[ pt ] = Caixa/Caracteres; Text[ ru ] = РегиÑÑÑ; diff --git a/binfilter/bf_sw/source/ui/inc/swmn.hrc b/binfilter/bf_sw/source/ui/inc/swmn.hrc index 28a768f..51b51a1 100644 --- a/binfilter/bf_sw/source/ui/inc/swmn.hrc +++ b/binfilter/bf_sw/source/ui/inc/swmn.hrc @@ -190,7 +190,7 @@ HelpID = FN_NUMBER_BULLETS ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Numerierung/Aufzählung... : ~Numerierung/Aufzõhlung... */\ Text [ de ] = ~Nummerierung/Aufzählung... ; \ -Text [ en-US ] = ~Numbering/Bullets... ; \ +Text [ en-US ] = ~Bullets and Numbering... ; \ Text [ x-comment ] = ;\ Text[ pt ] = ~Marcas/Numeração...;\ Text[ ru ] = ÐÑмеÑаÑиÑ/маÑкиÑовка...;\ diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src index 1c5d170..e1b8937 100644 --- a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src +++ b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src @@ -1690,7 +1690,7 @@ String STR_MERGE_TABLE String STR_TRANSLITERATE { Text [ de ] = GroÃ-/Kleinschreibung ; -Text [ en-US ] = Case/Characters; +Text [ en-US ] = ~Change Case; Text[ pt ] = Caixa/Caracteres; Text[ ru ] = ÑегиÑÑÑ; Text[ el ] = ÎεÏαλαία/Πεζά; diff --git a/binfilter/inc/bf_svx/globlmn.hrc b/binfilter/inc/bf_svx/globlmn.hrc index 6edca72..c3a6445 100644 --- a/binfilter/inc/bf_svx/globlmn.hrc +++ b/binfilter/inc/bf_svx/globlmn.hrc @@ -3757,7 +3757,7 @@ Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ HelpID = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ Text [ de ] = ~Nummerierung/Aufzählung... ; \ -Text [ en-US ] = ~Numbering/Bullets... ; \ +Text [ en-US ] = ~Bullets and Numbering... ; \ Text [ x-comment ] = ;\ Text[ pt ] = ~Marcas/Numeração...;\ Text[ ru ] = ÐÑмеÑаÑиÑ/маÑкиÑовка...;\ @@ -5479,7 +5479,7 @@ };\ };\ };\ -Text [ en-US ] = Case/Characters;\ +Text [ en-US ] = ~Change Case;\ Text [ x-comment ] = nk03.04.01: hier passt Englisch Uebesetzung besser.;\ Text[ pt ] = Caixa/Caracteres;\ Text[ ru ] = РегиÑÑÑ;\ diff --git a/helpcontent2/source/text/shared/00/00040500.xhp b/helpcontent2/source/text/shared/00/00040500.xhp index cda7d90..43a3e91 100644 --- a/helpcontent2/source/text/shared/00/00040500.xhp +++ b/helpcontent2/source/text/shared/00/00040500.xhp @@ -322,7 +322,7 @@ section id=grossklein paragraph xml-lang=en-US id=par_id3151254 role=paragraph l10n=CHG oldref=195Choose emphFormat - Change Case/emph /paragraph - paragraph xml-lang=en-US id=par_id3159624 role=paragraph l10n=U oldref=196Open context menu (text) - choose emphCase/Characters/emph + paragraph xml-lang=en-US id=par_id3159624 role=paragraph l10n=U oldref=196Open context menu (text) - choose emph~Change Case/emph /paragraph /section section id=ruby diff --git a/helpcontent2/source/text/shared/01/0505.xhp b/helpcontent2/source/text/shared/01/0505.xhp index 4526e65..91a8705 100644 --- a/helpcontent2/source/text/shared/01/0505.xhp +++ b/helpcontent2/source/text/shared/01/0505.xhp @@ -38,7 +38,7 @@ body section id=grossklein bookmark xml-lang=en-US
Re: [Libreoffice] [Patch] Unify Display Grid/ Grid Visible and other menu items
Christian Dywan schrieb: Am 06.05.2011 15:29:16 schrieb Regina Henschel: Hi Christian, I'm not sure about the changes. 'Snap Lines' is a better term than 'Guides'. The German term 'Fanglinien' describes it functionality, so does 'Snap Lines'. 'Guide' is not specific. It can be 'Snap Line' but also 'Helpline'. kind regards Regina Attached an updated patch, I missed the main menu item Guides/ Snap Lines before. The patch doesn't change any wording, strictly speaking, but it unifies the labels. The existence of conflicting terms hurts usability. I don't have a strong opinion on Guide versus Snap Line, both make sense to me, except it feels a bit redundant to talk about snapping to snap lines. If there is an agreement, that the 'Snap Lines' should be named 'Guides', then 'Guides' should only be used for those snapping lines. So then the icon with current display text 'Guides When Moving' should be 'Helplines When Moving' to distinguish it from snapping lines. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Patch] Unify Display Grid/ Grid Visible and other menu items
Hi Christian, Christian Dywan schrieb: Am 06.05.2011 15:29:16 schrieb Regina Henschel: Hi Christian, I'm not sure about the changes. 'Snap Lines' is a better term than 'Guides'. The German term 'Fanglinien' describes it functionality, so does 'Snap Lines'. 'Guide' is not specific. It can be 'Snap Line' but also 'Helpline'. I don't have a strong opinion on Guide versus Snap Line, both make sense to me, except it feels a bit redundant to talk about snapping to snap lines. I do not like 'Guides' but prefer 'Snap Lines'. There is also a dialog New Snap Object and dialogs Edit Snap Line and Edit Snap Point and menu item Insert Snap Line/Point. Insert Guide Point or Edit Guide Point sounds not good to me. This remembers me to the discussion Fanglinen vs Führungslinien in German some time ago. kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Patch] Unify Display Grid/ Grid Visible and other menu items
Hi Christian, part --- a/sd/source/ui/dlg/tpoption.src +++ b/sd/source/ui/dlg/tpoption.src @@ -57,7 +57,7 @@ TabPage TP_OPTIONS_CONTENTS Pos = MAP_APPFONT ( 12 , 97 - 69 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; -Text [ en-US ] = ~Guides when moving ; +Text [ en-US ] = ~Snap Lines when moving ; }; CheckBox CBX_HANDLES_BEZIER { seems to be wrong. Do you have used UTF8 encoding? The binfilter parts, which still contain a lot of languages, come with wrong characters here. Or is it a problem of my editor? kind regards Regina Christian Dywan schrieb: Am 06.05.2011 17:00:43 schrieb Regina Henschel: I do not like 'Guides' but prefer 'Snap Lines'. There is also a dialog New Snap Object and dialogs Edit Snap Line and Edit Snap Point and menu item Insert Snap Line/Point. Insert Guide Point or Edit Guide Point sounds not good to me. This remembers me to the discussion Fanglinen vs Führungslinien in German some time ago. You have convinced me and I went as far as fixing documentation to talk about helplines, so helplines is in fact unambiguously the term for the lines while moving, while the other guides are snap lines everywhere unless I missed any. This is indeed clearer. And it turns out I found a few inconsistent spellings that I fixed as a side effect. Visible Grid → Display Grid Guides → Snap Lines Display Guides → Display Snap Lines Snap to Guides → Snap to Snap Lines Guides when moving → Helplines While Moving Guides while moving → Helplines While Moving Numbering/Bullets → Bullets and Numbering... Case/Characters → Change Case ciao, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice