Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3924
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/3924/1
fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar/ (Part2)
cleanups and translations.
Change-Id: I2eccf057fecf6151c4604656464f3d8d1f6a7788
---
M sw/source/ui/ribbar/workctrl.cxx
M sw/source/ui/ribbar/workctrl.hrc
M sw/source/ui/ribbar/workctrl.src
3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 11a6fe8..f9bb55f 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -45,10 +45,10 @@
#include <vcl/svapp.hxx>
-// Size Abpruefung
+// Size check
#define NAVI_ENTRIES 20
#if NAVI_ENTRIES != NID_COUNT
-#error SwScrollNaviPopup-CTOR static Array falsche Size. Wurden neue IDs
zugefuegt ??
+#error SwScrollNaviPopup-CTOR instead array wrong size. Are new IDs added?
#endif
using namespace ::com::sun::star;
@@ -205,13 +205,14 @@
sal_uInt16 nGroupCount = pGlossaryList->GetGroupCount();
for(sal_uInt16 i = 1; i <= nGroupCount; i++)
{
- // Gruppenname mit Pfad-Extension besorgen
+ // Determine group name with path extension
+Gruppenname mit Pfad-Extension besorgen
String sTitle;
sal_uInt16 nBlockCount = pGlossaryList->GetBlockCount(i
-1);
if(nBlockCount)
{
sal_uInt16 nIndex = 100 * (i);
- // aber ohne extension einfuegen
+ // but insert without extension
pPopup->InsertItem( i, sTitle);
PopupMenu* pSub = new PopupMenu;
pSub->SetSelectHdl(aLnk);
@@ -243,7 +244,6 @@
return 0;
}
-
SfxPopupWindowType SwTbxAutoTextCtrl::GetPopupWindowType() const
{
@@ -334,7 +334,7 @@
}
}
-/* Navigations-Popup */
+// Navigation-Popup
// determine the order of the toolbox items
static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] =
{
@@ -487,7 +487,7 @@
aToolBox.SetItemText(NID_NEXT, sQuickHelp[nSet - NID_START]);
aToolBox.SetItemText(NID_PREV, sQuickHelp[nSet - NID_START +
NID_COUNT]);
aInfoField.SetText(aToolBox.GetItemText(nSet));
- //check the current button only
+ // check the current button only
for(sal_uInt16 i = 0; i < NID_COUNT; i++)
{
sal_uInt16 nItemId = aToolBox.GetItemId( i );
@@ -544,16 +544,12 @@
pPopup->StartPopupMode(aRect,
FLOATWIN_POPUPMODE_LEFT|FLOATWIN_POPUPMODE_ALLOWTEAROFF);
}
-//--------------------------------------------------------------------
-
void SwNaviImageButton::SetPopupWindow( SfxPopupWindow* pWindow )
{
pPopupWindow = pWindow;
pPopupWindow->SetPopupModeEndHdl( LINK( this, SwNaviImageButton,
PopupModeEndHdl ));
pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNaviImageButton,
ClosePopupWindow ));
}
-
-//--------------------------------------------------------------------
IMPL_LINK_NOARG(SwNaviImageButton, PopupModeEndHdl)
{
@@ -575,7 +571,6 @@
return 1;
}
-//--------------------------------------------------------------------
IMPL_LINK( SwNaviImageButton, ClosePopupWindow, SfxPopupWindow *, pWindow )
{
if ( pWindow == pFloatingWindow )
diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/ui/ribbar/workctrl.hrc
index 471b1ee..cee389b 100644
--- a/sw/source/ui/ribbar/workctrl.hrc
+++ b/sw/source/ui/ribbar/workctrl.hrc
@@ -45,8 +45,8 @@
#define ST_TABLE_FORMULA 28
#define ST_TABLE_FORMULA_ERROR 29
-// doppelter Eintrag! hrc und hxx
-// diese Ids bestimmen, was die Buttons unter dem Scrollbar tun
+// duplicate entry! hrc and hxx
+// these Ids specifiy the action of the buttons below the scroll bar
#define NID_START 20000
#define NID_NEXT 20000
#define NID_PREV 20001
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index 2522a5e..23e60ad 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -205,9 +205,9 @@
};
Text [ en-US ] = "Navigation" ;
};
-/***************************************************************
- Strings fuer die Quickhelp der View-PgUp/Down-Buttons
-***************************************************************/
+
+// Strings for the quickhelp of the View-PgUp/Down-Buttons
+
String STR_IMGBTN_NEXT_DOWN
{
Text = "" ;
--
To view, visit https://gerrit.libreoffice.org/3924
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2eccf057fecf6151c4604656464f3d8d1f6a7788
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti...@yahoo.de>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
