diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 21:49:54 +0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 21:49:54 +0400 |
commit | ea2385432817dcf5ad47396d83932f564aa76e4b (patch) | |
tree | effc5c5489cf385ee79c73a4bea59605f53240f9 /apps/gallery | |
parent | ba0cf9817526e1206a25a5fe6d70255ab3c9e3bc (diff) | |
parent | fe6450002d6059260c743f48b6f40378454fa1dc (diff) |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
Diffstat (limited to 'apps/gallery')
-rw-r--r-- | apps/gallery/js/pictures.js | 4 | ||||
-rw-r--r-- | apps/gallery/l10n/pl.php | 8 | ||||
-rw-r--r-- | apps/gallery/l10n/tr.php | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/apps/gallery/js/pictures.js b/apps/gallery/js/pictures.js index 91fbf5be967..47f727e0dee 100644 --- a/apps/gallery/js/pictures.js +++ b/apps/gallery/js/pictures.js @@ -61,8 +61,8 @@ function deplode(element) { function openNewGal(album_name) { root = root + decodeURIComponent(album_name) + "/"; - var url = window.location.toString().replace(window.location.search, ''); - url = url + "?app=gallery&root="+encodeURIComponent(root); + var url = window.location.protocol+"//"+window.location.hostname+OC.linkTo('gallery', 'index.php'); + url = url + "?root="+encodeURIComponent(root); window.location = url; } diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php index 1ff636ac2a0..8c0bd0cb98d 100644 --- a/apps/gallery/l10n/pl.php +++ b/apps/gallery/l10n/pl.php @@ -1,9 +1,9 @@ <?php $TRANSLATIONS = array( "Pictures" => "Zdjęcia", -"Settings" => "Ustawienia", -"Rescan" => "Przeszukaj", -"Stop" => "Stop", -"Share" => "Współdziel", +"Share gallery" => "Udostępnij galerię", +"Error: " => "Błąd: ", +"Internal error" => "Błąd wewnętrzny", +"Slideshow" => "Pokaz slajdów", "Back" => "Wróć", "Remove confirmation" => "Usuń potwierdzenie", "Do you want to remove album" => "Czy chcesz usunąć album", diff --git a/apps/gallery/l10n/tr.php b/apps/gallery/l10n/tr.php index c42592448cb..7d007fa66e1 100644 --- a/apps/gallery/l10n/tr.php +++ b/apps/gallery/l10n/tr.php @@ -1,9 +1,9 @@ <?php $TRANSLATIONS = array( "Pictures" => "Resimler", -"Settings" => "Ayarlar", -"Rescan" => "Yeniden Tara ", -"Stop" => "Durdur", -"Share" => "Paylaş", +"Share gallery" => "Galeriyi paylaş", +"Error: " => "Hata: ", +"Internal error" => "İç hata", +"Slideshow" => "Slide Gösterim", "Back" => "Geri", "Remove confirmation" => "Doğrulamayı kaldır", "Do you want to remove album" => "Albümü silmek istiyor musunuz", |