Skip to content
This repository has been archived by the owner on Nov 23, 2020. It is now read-only.

Commit

Permalink
mergetool
Browse files Browse the repository at this point in the history
  • Loading branch information
@tabacitu
tabacitu committed Apr 21, 2017
2 parents 1838904 + 7b7d843 commit a8fcf39
Show file tree
Hide file tree
Showing 75 changed files with 150 additions and 75 deletions.
3 changes: 2 additions & 1 deletion src/resources/lang/bg/backup.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../backupmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/bg/crud.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../crud/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/bg/logmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../logmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/bg/permissionmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../permissionmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/bg/settings.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../settings/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/de/backup.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../backupmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/de/crud.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../crud/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/de/logmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../logmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/de/permissionmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../permissionmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/de/settings.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../settings/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/el/backup.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../backupmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/el/crud.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../crud/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/el/logmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../logmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/el/permissionmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../permissionmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/el/settings.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../settings/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/en/backup.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../backupmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/en/crud.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../crud/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/en/logmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../logmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/en/permissionmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../permissionmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/en/settings.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../settings/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/es/backup.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../backupmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/es/crud.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../crud/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/es/logmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../logmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/es/permissionmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../permissionmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/es/settings.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../settings/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/fr/backup.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../backupmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/fr/crud.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../crud/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/fr/logmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../logmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/fr/permissionmanager.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../permissionmanager/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
3 changes: 2 additions & 1 deletion src/resources/lang/fr/settings.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

// --------------------------------------------------------
// This is only a pointer file, not an actual language file
// --------------------------------------------------------
Expand All @@ -12,4 +13,4 @@
return include(__DIR__ . '/../../../../../settings/src/resources/lang/'.basename(__DIR__).'/'.basename(__FILE__));
}

return [];
return [];
Loading

0 comments on commit a8fcf39

Please sign in to comment.