From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 8 Jun 2012 09:21:55 +0000 (+0200)
Subject: fix merge conflicts
X-Git-Tag: v4.5.0beta1~74^2~407^2~57
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=65cd15ca1505fd7acf4dd7b7e66702adc20e3a3d;p=nextcloud-server.git

fix merge conflicts
---

65cd15ca1505fd7acf4dd7b7e66702adc20e3a3d
diff --cc apps/calendar/templates/settings.php
index 40cef079593,feb06655120..6d018f15110
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@@ -8,49 -8,50 +8,54 @@@
   */
  ?>
  <form id="calendar">
-         <fieldset class="personalblock">
+ 	<fieldset class="personalblock">
  	<legend><?php echo $l->t('Calendar'); ?></legend>
-         <table class="nostyle">
-             <tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
-                 <?php
-                 $continent = '';
-                 foreach($_['timezones'] as $timezone):
-                     $ex=explode('/', $timezone, 2);//obtain continent,city
-                     if (!isset($ex[1])) {
-                             $ex[1] = $ex[0];
-                             $ex[0] = "Other";
-                     }
-                     if ($continent!=$ex[0]):
-                         if ($continent!="") echo '</optgroup>';
-                         echo '<optgroup label="'.$ex[0].'">';
-                     endif;
+ 		<table class="nostyle">
+ 			<tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
+ 				<?php
+ 				$continent = '';
+ 				foreach($_['timezones'] as $timezone):
+ 					$ex=explode('/', $timezone, 2);//obtain continent,city
+ 					if (!isset($ex[1])) {
+ 						$ex[1] = $ex[0];
+ 						$ex[0] = "Other";
+ 					}
+ 					if ($continent!=$ex[0]):
+ 						if ($continent!="") echo '</optgroup>';
+ 						echo '<optgroup label="'.$ex[0].'">';
+ 					endif;
  					$city=strtr($ex[1], '_', ' ');
-                     $continent=$ex[0];
-                     echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
-                 endforeach;?>
-             </select><input type="checkbox" name="timezonedetection" id="timezonedetection"><label for="timezonedetection"><?php echo $l->t('Check always for changes of the timezone'); ?></label></td></tr>
+ 					$continent=$ex[0];
+ 					echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
+ 				endforeach;?>
+ 			</select><input type="checkbox" name="timezonedetection" id="timezonedetection"><label for="timezonedetection"><?php echo $l->t('Check always for changes of the timezone'); ?></label></td></tr>
  
-             <tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
-                 <select style="display: none; width: 60px;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
-                     <option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
-                     <option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
-                 </select>
-             </td></tr>
+ 			<tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
+ 				<select style="display: none; width: 60px;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
+ 					<option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
+ 					<option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
+ 				</select>
+ 			</td></tr>
  
-             <tr><td><label for="firstday" class="bold"><?php echo $l->t('First day of the week');?></label></td><td>
-                 <select style="display: none;" id="firstday" title="<?php echo "First day"; ?>" name="firstday">
-                     <option value="mo" id="mo"><?php echo $l->t("Monday"); ?></option>
-                     <option value="su" id="su"><?php echo $l->t("Sunday"); ?></option>
-                 </select>
-             </td></tr>
+ 			<tr><td><label for="firstday" class="bold"><?php echo $l->t('First day of the week');?></label></td><td>
+ 				<select style="display: none;" id="firstday" title="<?php echo "First day"; ?>" name="firstday">
+ 					<option value="mo" id="mo"><?php echo $l->t("Monday"); ?></option>
+ 					<option value="su" id="su"><?php echo $l->t("Sunday"); ?></option>
+ 				</select>
+ 			</td></tr>
  
 -		</table>
 +            <tr><td><label for="" class="bold"><?php echo $l->t('Cache');?></label></td><td>
 +                <input id="cleancalendarcache" type="button" class="button" value="<?php echo $l->t('Clear cache for repeating events');?>">
 +            </td></tr>
 +
 +        </table>
  
-         <?php echo $l->t('Calendar CalDAV syncing address:');?>
-         <code><?php echo OCP\Util::linkToRemote('caldav'); ?></code><br />
+ 		<?php echo $l->t('Calendar CalDAV syncing addresses'); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php echo $l->t('more info'); ?></a>)
+ 		<dl>
+ 		<dt><?php echo $l->t('Primary address (Kontact et al)'); ?></dt>
+ 		<dd><code><?php echo OCP\Util::linkToRemote('caldav'); ?></code></dd>
+ 		<dt><?php echo $l->t('iOS/OS X'); ?></dt>
+ 		<dd><code><?php echo OCP\Util::linkToRemote('caldav'); ?>principals/<?php echo OCP\USER::getUser(); ?></code>/</dd>
+ 		</dl>
          </fieldset>
  </form>