cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ldel...@apache.org
Subject git commit: CB-6127lisa7cordova-plugin-consolecordova-plugin-vibration documentation translation: cordova-plugin-vibration
Date Mon, 07 Jul 2014 19:28:45 GMT
Repository: cordova-plugin-vibration
Updated Branches:
  refs/heads/master 9da96fc03 -> 112254e6a


CB-6127lisa7cordova-plugin-consolecordova-plugin-vibration documentation translation: cordova-plugin-vibration


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/commit/112254e6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/tree/112254e6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/diff/112254e6

Branch: refs/heads/master
Commit: 112254e6ae57383b46966d39b2e2e3185483d8d8
Parents: 9da96fc
Author: Lisa Seacat DeLuca <ldeluca@us.ibm.com>
Authored: Mon Jul 7 15:28:37 2014 -0400
Committer: Lisa Seacat DeLuca <ldeluca@us.ibm.com>
Committed: Mon Jul 7 15:28:37 2014 -0400

----------------------------------------------------------------------
 doc/it/index.md | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/blob/112254e6/doc/it/index.md
----------------------------------------------------------------------
diff --git a/doc/it/index.md b/doc/it/index.md
index a562ddd..1a3ba5f 100644
--- a/doc/it/index.md
+++ b/doc/it/index.md
@@ -28,7 +28,6 @@ Questo plugin consente di vibrare il dispositivo.
 
 ## Piattaforme supportate
 
-<<<<<<< HEAD
 Navigator.Notification.vibrate - Amazon fuoco OS - OS di Firefox - 10 BlackBerry - Android
- iOS - Windows Phone 7 e 8
 
 navigator.notification.vibrateWithPattern,  
@@ -37,44 +36,23 @@ navigator.notification.cancelVibration - Android
 ## Notification.vibrate
 
 Vibra il dispositivo per un determinato periodo di tempo.
-=======
-*   Amazon fuoco OS
-*   Android
-*   BlackBerry 10
-*   Firefox OS
-*   iOS
-*   Windows Phone 7 e 8
-
-## Notification.vibrate
-
-Vibra il dispositivo per il periodo di tempo specificato.
->>>>>>> 74bc4572943378e7e17deff8f09889de0c8fea85
 
     navigator.notification.vibrate(time)
     
 
 *   **tempo**: millisecondi a vibrare il dispositivo. *(Numero)*
 
-<<<<<<< HEAD
 ### Esempio
-=======
-## Esempio
->>>>>>> 74bc4572943378e7e17deff8f09889de0c8fea85
 
     // Vibrate for 2.5 seconds
     navigator.notification.vibrate(2500);
     
 
-<<<<<<< HEAD
 ### iOS stranezze
-=======
-## iOS stranezze
->>>>>>> 74bc4572943378e7e17deff8f09889de0c8fea85
 
 *   **tempo**: ignora il tempo specificato e vibra per un tempo pre-impostato.
     
         navigator.notification.vibrate();
-<<<<<<< HEAD
         navigator.notification.vibrate(2500);   // 2500 is ignored
         
 
@@ -106,7 +84,4 @@ Vibra il dispositivo con un determinato modello.
 
 Annulla immediatamente qualsiasi vibrazione attualmente in esecuzione.
 
-    navigator.notification.cancelVibration()
-=======
-        navigator.notification.vibrate(2500);   // 2500 is ignored
->>>>>>> 74bc4572943378e7e17deff8f09889de0c8fea85
+    navigator.notification.cancelVibration()
\ No newline at end of file


Mime
View raw message