aboutsummaryrefslogtreecommitdiff
path: root/source/bs/uui
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-05-25 19:40:31 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-05-25 20:12:45 +0200
commit87fc3ca7cba6ea6be066cc79bed965aaa596f426 (patch)
treefa73ba53499587383acf02dc95540f6a497c2c01 /source/bs/uui
parentcfc31b7c53b06bab97be6b2cd9503423120ea1fe (diff)
update translations for 5.2.0 beta1
and force-fix errors using pocheck Change-Id: I9dac678a4e705f255463e6ba3b127f423e82fd65
Diffstat (limited to 'source/bs/uui')
-rw-r--r--source/bs/uui/uiconfig/ui.po43
1 files changed, 37 insertions, 6 deletions
diff --git a/source/bs/uui/uiconfig/ui.po b/source/bs/uui/uiconfig/ui.po
index 58ee6f81346..2c574755077 100644
--- a/source/bs/uui/uiconfig/ui.po
+++ b/source/bs/uui/uiconfig/ui.po
@@ -3,18 +3,18 @@ msgid ""
msgstr ""
"Project-Id-Version: LibO 40l10n\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-06-24 17:06+0200\n"
-"PO-Revision-Date: 2015-05-12 02:39+0000\n"
-"Last-Translator: system user <>\n"
+"POT-Creation-Date: 2016-05-23 21:37+0200\n"
+"PO-Revision-Date: 2015-12-11 15:10+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
"Language-Team: none\n"
"Language: bs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Pootle 2.7\n"
"X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431398393.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1449846622.000000\n"
#: authfallback.ui
msgctxt ""
@@ -22,7 +22,16 @@ msgctxt ""
"AuthFallbackDlg\n"
"title\n"
"string.text"
-msgid "OneDrive Authentication Code"
+msgid "Authentication Code"
+msgstr ""
+
+#: authfallback.ui
+msgctxt ""
+"authfallback.ui\n"
+"google_prefix_label\n"
+"label\n"
+"string.text"
+msgid "G-"
msgstr ""
#: filterselect.ui
@@ -121,6 +130,28 @@ msgstr ""
#: logindialog.ui
msgctxt ""
"logindialog.ui\n"
+"wrongloginrealm\n"
+"label\n"
+"string.text"
+msgid ""
+"Wrong user name and password for:\n"
+"“%2” on %1"
+msgstr ""
+
+#: logindialog.ui
+msgctxt ""
+"logindialog.ui\n"
+"wrongrequestinfo\n"
+"label\n"
+"string.text"
+msgid ""
+"Wrong user name and password for:\n"
+"%1"
+msgstr ""
+
+#: logindialog.ui
+msgctxt ""
+"logindialog.ui\n"
"requestinfo\n"
"label\n"
"string.text"
generated by cgit (git 2.34.1) at 2025-01-18 18:40:07 +0000
value='libreoffice-4-0-6'>libreoffice-4-0-6 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/basebmp/inc
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2011-11-03 14:58:40 +0100
committerThorsten Behrens <tbehrens@suse.com>2011-11-03 15:02:00 +0100
commitf7975d2335334899e5d14e35e7640d3afdf220f6 (patch)
tree2c97dc4a14afce606d8f68ee28777c917371ab17 /basebmp/inc
parent3e8dee1a48bd80c52b5adda6bd9358c2136ea764 (diff)
Fix one more subtlety around B2IBox / B2IRange changes.
The Cohen/Sutherland clip flag routine was not aware of B2IBox, thusly yielding incorrect line clipping for BitmapDevice software rendering. Cleaned that up, added some more unit tests around the problem, and removed the now-extraneous maLineClip member from the bitmap device.
Diffstat (limited to 'basebmp/inc')
-rw-r--r--basebmp/inc/basebmp/bitmapdevice.hxx22
-rw-r--r--basebmp/inc/basebmp/clippedlinerenderer.hxx2
2 files changed, 12 insertions, 12 deletions
diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx
index 1e6d73b92923..f97ec4fc8778 100644
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/basebmp/inc/basebmp/bitmapdevice.hxx
@@ -664,8 +664,8 @@ private:
/** Factory method to create a BitmapDevice for given scanline format
*/
BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
- bool bTopDown,
- sal_Int32 nScanlineFormat );
+ bool bTopDown,
+ sal_Int32 nScanlineFormat );
/** Factory method to create a BitmapDevice for given scanline format
with the given palette
@@ -675,9 +675,9 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVe
format.
*/
BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
- bool bTopDown,
- sal_Int32 nScanlineFormat,
- const PaletteMemorySharedVector& rPalette );
+ bool bTopDown,
+ sal_Int32 nScanlineFormat,
+ const PaletteMemorySharedVector& rPalette );
/** Factory method to create a BitmapDevice for given scanline format
from the given piece of raw memory and palette
@@ -686,10 +686,10 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVe
image of the specified area and format.
*/
BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
- bool bTopDown,
- sal_Int32 nScanlineFormat,
- const RawMemorySharedArray& rMem,
- const PaletteMemorySharedVector& rPalette );
+ bool bTopDown,
+ sal_Int32 nScanlineFormat,
+ const RawMemorySharedArray& rMem,
+ const PaletteMemorySharedVector& rPalette );
/** Factory method to retrieve a subsetted BitmapDevice to the same
@@ -709,8 +709,8 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSh
copied, only the size can be varied. Note that the prototype's
bitmap content is <em>not</em> copied, only a palette (if any).
*/
-BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize,
- const BitmapDeviceSharedPtr& rProto );
+BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize,
+ const BitmapDeviceSharedPtr& rProto );
}
diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/basebmp/inc/basebmp/clippedlinerenderer.hxx
index 2fbf2f7acfe0..9969b968ff8a 100644
--- a/basebmp/inc/basebmp/clippedlinerenderer.hxx
+++ b/basebmp/inc/basebmp/clippedlinerenderer.hxx
@@ -200,7 +200,7 @@ inline bool prepareClip( sal_Int32 a1,
template< class Iterator, class Accessor >
void renderClippedLine( basegfx::B2IPoint aPt1,
basegfx::B2IPoint aPt2,
- const basegfx::B2IBox& rClipRect,
+ const basegfx::B2IBox& rClipRect,
typename Accessor::value_type color,
Iterator begin,
Accessor acc,
generated by cgit (git 2.34.1) at 2025-01-18 18:40:05 +0000