Merge branch 'master' of https://github.com/pulsejet/memories
Varun Patil
commit
0774c857cf
|
|
@ -22,6 +22,7 @@ OC.L10N.register(
|
|||
"Favorite" : "お気に入り",
|
||||
"Unarchive" : "アーカイブを解除",
|
||||
"View in folder" : "フォルダー内で表示",
|
||||
"Add to album" : "アルバムに追加",
|
||||
"General" : "一般",
|
||||
"Account" : "アカウント",
|
||||
"Close" : "閉じる",
|
||||
|
|
@ -33,7 +34,10 @@ OC.L10N.register(
|
|||
"No items" : "アイテムがありません",
|
||||
"Shared by {user}" : "{user} から共有されました",
|
||||
"Add people or groups who can edit your album" : "アルバムを編集できる人またはグループを追加する",
|
||||
"Search for collaborators" : "共同作業者を探す",
|
||||
"Search people or groups" : "人またはグループを検索",
|
||||
"Add {collaboratorLabel} to the collaborators list" : "共同作業者リストに {collaboratorLabel} を追加する",
|
||||
"No collaborators available" : "共同作業者はいない",
|
||||
"Remove {collaboratorLabel} from the collaborators list" : "コラボレーターリストから {collaboratorLabel} を削除する",
|
||||
"Copy the public link" : "公開リンクをコピー",
|
||||
"Public link copied!" : "公開リンクをコピーしました！",
|
||||
|
|
@ -42,6 +46,7 @@ OC.L10N.register(
|
|||
"Share via public link" : "公開リンクで共有する",
|
||||
"Failed to fetch collaborators list." : "共同作業者リストの取得に失敗しました。",
|
||||
"Public link" : "公開リンク",
|
||||
"Failed to fetch album." : "アルバムの取得に失敗しました。",
|
||||
"Failed to update album." : "アルバムの更新に失敗しました。",
|
||||
"Create new album" : "新しいアルバムを作成",
|
||||
"Edit album details" : "アルバム詳細の編集",
|
||||
|
|
@ -50,7 +55,9 @@ OC.L10N.register(
|
|||
"Location of the album" : "アルバムの場所",
|
||||
"Go back to the previous view." : "前を表示",
|
||||
"Back" : "戻る",
|
||||
"Go to the add collaborators view." : "共同作業者の追加画面に移動します。",
|
||||
"Add collaborators" : "共有者に追加",
|
||||
"Back to the new album form." : "新しいアルバムのフォームに戻る。",
|
||||
"Save" : "保存",
|
||||
"Create album" : "アルバムを作成",
|
||||
"Search" : "検索",
|
||||
|
|
@ -69,6 +76,8 @@ OC.L10N.register(
|
|||
"Empty" : "空",
|
||||
"Reset" : "リセット",
|
||||
"Collaborative Tags" : "コラボタグ",
|
||||
"Remove person" : "人物を削除する",
|
||||
"Rename person" : "名前を変更する",
|
||||
"Name" : "名前",
|
||||
"Update" : "更新",
|
||||
"Loading …" : "読み込み中…",
|
||||
|
|
@ -82,6 +91,8 @@ OC.L10N.register(
|
|||
"Link copied to clipboard" : "クリップボードにリンクをコピーしました",
|
||||
"Sort by date" : "日付で整列",
|
||||
"Sort by name" : "名前で整列",
|
||||
"Unassigned faces" : "未割り当ての顔",
|
||||
"Merge with different person" : "別人と統合",
|
||||
"Share folder" : "フォルダーを共有",
|
||||
"Error saving image" : "画像保存でのエラー",
|
||||
"Unsaved changes" : "保存していない変更点",
|
||||
|
|
@ -122,6 +133,9 @@ OC.L10N.register(
|
|||
"Direct" : "ダイレクト",
|
||||
"Auto" : "自動",
|
||||
"Setup" : "設定",
|
||||
"Failed to create {albumName}." : "{albumName} の作成に失敗しました。",
|
||||
"Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} から {newAlbumName} への名前の変更に失敗しました。",
|
||||
"Failed to delete {fileName}." : "{fileName} の削除に失敗しました。",
|
||||
"Yes" : "はい",
|
||||
"No" : "いいえ"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
"Favorite" : "お気に入り",
|
||||
"Unarchive" : "アーカイブを解除",
|
||||
"View in folder" : "フォルダー内で表示",
|
||||
"Add to album" : "アルバムに追加",
|
||||
"General" : "一般",
|
||||
"Account" : "アカウント",
|
||||
"Close" : "閉じる",
|
||||
|
|
@ -31,7 +32,10 @@
|
|||
"No items" : "アイテムがありません",
|
||||
"Shared by {user}" : "{user} から共有されました",
|
||||
"Add people or groups who can edit your album" : "アルバムを編集できる人またはグループを追加する",
|
||||
"Search for collaborators" : "共同作業者を探す",
|
||||
"Search people or groups" : "人またはグループを検索",
|
||||
"Add {collaboratorLabel} to the collaborators list" : "共同作業者リストに {collaboratorLabel} を追加する",
|
||||
"No collaborators available" : "共同作業者はいない",
|
||||
"Remove {collaboratorLabel} from the collaborators list" : "コラボレーターリストから {collaboratorLabel} を削除する",
|
||||
"Copy the public link" : "公開リンクをコピー",
|
||||
"Public link copied!" : "公開リンクをコピーしました！",
|
||||
|
|
@ -40,6 +44,7 @@
|
|||
"Share via public link" : "公開リンクで共有する",
|
||||
"Failed to fetch collaborators list." : "共同作業者リストの取得に失敗しました。",
|
||||
"Public link" : "公開リンク",
|
||||
"Failed to fetch album." : "アルバムの取得に失敗しました。",
|
||||
"Failed to update album." : "アルバムの更新に失敗しました。",
|
||||
"Create new album" : "新しいアルバムを作成",
|
||||
"Edit album details" : "アルバム詳細の編集",
|
||||
|
|
@ -48,7 +53,9 @@
|
|||
"Location of the album" : "アルバムの場所",
|
||||
"Go back to the previous view." : "前を表示",
|
||||
"Back" : "戻る",
|
||||
"Go to the add collaborators view." : "共同作業者の追加画面に移動します。",
|
||||
"Add collaborators" : "共有者に追加",
|
||||
"Back to the new album form." : "新しいアルバムのフォームに戻る。",
|
||||
"Save" : "保存",
|
||||
"Create album" : "アルバムを作成",
|
||||
"Search" : "検索",
|
||||
|
|
@ -67,6 +74,8 @@
|
|||
"Empty" : "空",
|
||||
"Reset" : "リセット",
|
||||
"Collaborative Tags" : "コラボタグ",
|
||||
"Remove person" : "人物を削除する",
|
||||
"Rename person" : "名前を変更する",
|
||||
"Name" : "名前",
|
||||
"Update" : "更新",
|
||||
"Loading …" : "読み込み中…",
|
||||
|
|
@ -80,6 +89,8 @@
|
|||
"Link copied to clipboard" : "クリップボードにリンクをコピーしました",
|
||||
"Sort by date" : "日付で整列",
|
||||
"Sort by name" : "名前で整列",
|
||||
"Unassigned faces" : "未割り当ての顔",
|
||||
"Merge with different person" : "別人と統合",
|
||||
"Share folder" : "フォルダーを共有",
|
||||
"Error saving image" : "画像保存でのエラー",
|
||||
"Unsaved changes" : "保存していない変更点",
|
||||
|
|
@ -120,6 +131,9 @@
|
|||
"Direct" : "ダイレクト",
|
||||
"Auto" : "自動",
|
||||
"Setup" : "設定",
|
||||
"Failed to create {albumName}." : "{albumName} の作成に失敗しました。",
|
||||
"Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} から {newAlbumName} への名前の変更に失敗しました。",
|
||||
"Failed to delete {fileName}." : "{fileName} の削除に失敗しました。",
|
||||
"Yes" : "はい",
|
||||
"No" : "いいえ"
|
||||
},"pluralForm" :"nplurals=1; plural=0;"
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ OC.L10N.register(
|
|||
"Close" : "Zatvoriť",
|
||||
"Info" : "Info",
|
||||
"Failed to load some photos" : "Načítanie akýchkoľvek fotiek zlyhalo",
|
||||
"Failed to update setting" : "Nepodarilo sa aktualizovať nastavenie",
|
||||
"It took {t} seconds to complete." : "Dokončenie trvalo {t} sekúnd.",
|
||||
"Performance" : "Výkon",
|
||||
"Unknown" : "Neznámy",
|
||||
|
|
@ -41,6 +42,7 @@ OC.L10N.register(
|
|||
"Template" : "Šablóny",
|
||||
"No items" : "Žiadne položky",
|
||||
"Shared by {user}" : "Zdieľa {user}",
|
||||
"_{n} photo updated_::_{n} photos updated_" : ["{n} fotka bola aktualizovaná","{n} fotky boli aktualizované","{n} fotiek bolo aktualizovaných","{n} fotiek bolo aktualizovaných"],
|
||||
"Add people or groups who can edit your album" : "Pridať užívateľov alebo skupiny ktoré môžu upravovať váš album",
|
||||
"Search for collaborators" : "Vyhľadať spolupracovníkov",
|
||||
"Search people or groups" : "Vyhľadať užívateľov alebo skupiny",
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
"Close" : "Zatvoriť",
|
||||
"Info" : "Info",
|
||||
"Failed to load some photos" : "Načítanie akýchkoľvek fotiek zlyhalo",
|
||||
"Failed to update setting" : "Nepodarilo sa aktualizovať nastavenie",
|
||||
"It took {t} seconds to complete." : "Dokončenie trvalo {t} sekúnd.",
|
||||
"Performance" : "Výkon",
|
||||
"Unknown" : "Neznámy",
|
||||
|
|
@ -39,6 +40,7 @@
|
|||
"Template" : "Šablóny",
|
||||
"No items" : "Žiadne položky",
|
||||
"Shared by {user}" : "Zdieľa {user}",
|
||||
"_{n} photo updated_::_{n} photos updated_" : ["{n} fotka bola aktualizovaná","{n} fotky boli aktualizované","{n} fotiek bolo aktualizovaných","{n} fotiek bolo aktualizovaných"],
|
||||
"Add people or groups who can edit your album" : "Pridať užívateľov alebo skupiny ktoré môžu upravovať váš album",
|
||||
"Search for collaborators" : "Vyhľadať spolupracovníkov",
|
||||
"Search people or groups" : "Vyhľadať užívateľov alebo skupiny",
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ class BinExt
|
|||
$version = trim($out);
|
||||
$target = self::EXIFTOOL_VER;
|
||||
if (!version_compare($version, $target, '=')) {
|
||||
throw new \Exception("version does not match {$version} <==> {$target}");
|
||||
throw new \Exception("exiftool version does not match: expected {$target} but found {$version}");
|
||||
}
|
||||
|
||||
// Test with actual file
|
||||
|
|
@ -338,7 +338,7 @@ class BinExt
|
|||
$version = $json['version'];
|
||||
$target = self::GOVOD_VER;
|
||||
if (!version_compare($version, $target, '=')) {
|
||||
throw new \Exception("version does not match {$version} <==> {$target}");
|
||||
throw new \Exception("govod version does not match: expected {$target} but found {$version}");
|
||||
}
|
||||
|
||||
return $version;
|
||||
|
|
|
|||
Loading…
Reference in New Issue