From 503c332b132411fe9c89637fa85dc0bd5c0ba2a5 Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Fri, 21 Apr 2006 19:38:50 +0000 Subject: [PATCH] Another fix for 4.X. Submitted by: RSIBreak author --- .../files/patch-rsibreak_src_rsiglobals.cpp | 16 ++++++++++++++++ .../files/patch-rsibreak_src_rsiglobals.cpp | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 x11/rsibreak-kde4/files/patch-rsibreak_src_rsiglobals.cpp create mode 100644 x11/rsibreak/files/patch-rsibreak_src_rsiglobals.cpp diff --git a/x11/rsibreak-kde4/files/patch-rsibreak_src_rsiglobals.cpp b/x11/rsibreak-kde4/files/patch-rsibreak_src_rsiglobals.cpp new file mode 100644 index 000000000000..e988c9ff0d79 --- /dev/null +++ b/x11/rsibreak-kde4/files/patch-rsibreak_src_rsiglobals.cpp @@ -0,0 +1,16 @@ +--- rsibreak/src/rsiglobals.cpp.orig Fri Apr 21 21:35:42 2006 ++++ rsibreak/src/rsiglobals.cpp Fri Apr 21 21:36:17 2006 +@@ -72,11 +72,11 @@ QString RSIGlobals::formatSeconds( const + sString1 = i18n("One second","%n seconds", secs); + sString2 = i18n("one second","%n seconds", secs); + +- if ( hours > 0 and mins >0 ) ++ if ( hours > 0 && mins >0 ) + return(i18n("Arguments: hours, minutes " + "both as you defined earlier", + "%1 and %2").arg(hString, mString2) ); +- else if ( hours > 0 and mins == 0 ) ++ else if ( hours > 0 && mins == 0 ) + return( hString ); + + else if ( hours == 0 ) diff --git a/x11/rsibreak/files/patch-rsibreak_src_rsiglobals.cpp b/x11/rsibreak/files/patch-rsibreak_src_rsiglobals.cpp new file mode 100644 index 000000000000..e988c9ff0d79 --- /dev/null +++ b/x11/rsibreak/files/patch-rsibreak_src_rsiglobals.cpp @@ -0,0 +1,16 @@ +--- rsibreak/src/rsiglobals.cpp.orig Fri Apr 21 21:35:42 2006 ++++ rsibreak/src/rsiglobals.cpp Fri Apr 21 21:36:17 2006 +@@ -72,11 +72,11 @@ QString RSIGlobals::formatSeconds( const + sString1 = i18n("One second","%n seconds", secs); + sString2 = i18n("one second","%n seconds", secs); + +- if ( hours > 0 and mins >0 ) ++ if ( hours > 0 && mins >0 ) + return(i18n("Arguments: hours, minutes " + "both as you defined earlier", + "%1 and %2").arg(hString, mString2) ); +- else if ( hours > 0 and mins == 0 ) ++ else if ( hours > 0 && mins == 0 ) + return( hString ); + + else if ( hours == 0 )