1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

Another fix for 4.X.

Submitted by:	RSIBreak author
This commit is contained in:
Alex Dupre 2006-04-21 19:38:50 +00:00
parent 944de0902b
commit 503c332b13
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=160090
2 changed files with 32 additions and 0 deletions

View File

@ -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 )

View File

@ -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 )