From d2239cb8b9f1e594173e41d4afe2b6949bb53609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 13 Dec 2012 22:43:26 +0100 Subject: [PATCH 01/20] BMessage::SetString() was broken. * We cannot use the macro for this, unfortunately. --- src/kits/app/Message.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp index 36db0779ad..3c0dbe6483 100644 --- a/src/kits/app/Message.cpp +++ b/src/kits/app/Message.cpp @@ -2564,7 +2564,6 @@ DEFINE_SET_GET_FUNCTIONS(uint64, UInt64, B_UINT64_TYPE); DEFINE_SET_GET_FUNCTIONS(bool, Bool, B_BOOL_TYPE); DEFINE_SET_GET_FUNCTIONS(float, Float, B_FLOAT_TYPE); DEFINE_SET_GET_FUNCTIONS(double, Double, B_DOUBLE_TYPE); -DEFINE_SET_GET_FUNCTIONS(const char *, String, B_STRING_TYPE); #undef DEFINE_SET_GET_FUNCTION @@ -3136,6 +3135,25 @@ BMessage::HasFlat(const char *name, int32 index, const BFlattenable *object) } +const char* +BMessage::GetString(const char *name, const char *defaultValue) const +{ + return GetString(name, 0, defaultValue); +} + + +const char* +BMessage::GetString(const char *name, int32 index, + const char *defaultValue) const +{ + const char* value; + if (FindString(name, index, &value) == B_OK) + return value; + + return defaultValue; +} + + status_t BMessage::SetString(const char *name, const BString& value) { @@ -3143,6 +3161,13 @@ BMessage::SetString(const char *name, const BString& value) } +status_t +BMessage::SetString(const char *name, const char* value) +{ + return SetData(name, B_STRING_TYPE, value, strlen(value) + 1); +} + + status_t BMessage::SetData(const char* name, type_code type, const void* data, ssize_t numBytes) From 32da57f74b8855c63e422aa74628d904f99f8ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 12 Feb 2013 22:24:16 +0100 Subject: [PATCH 02/20] DriveSetup: solved a few issues of CreateParametersPanel. * I obviously wasn't really done last time: now the panel behaves as it should. --- .../drivesetup/AbstractParametersPanel.cpp | 121 +++++++++++------- src/apps/drivesetup/AbstractParametersPanel.h | 4 + src/apps/drivesetup/CreateParametersPanel.cpp | 62 +++++++-- src/apps/drivesetup/CreateParametersPanel.h | 3 + 4 files changed, 129 insertions(+), 61 deletions(-) diff --git a/src/apps/drivesetup/AbstractParametersPanel.cpp b/src/apps/drivesetup/AbstractParametersPanel.cpp index 1c38f64029..b161494eb6 100644 --- a/src/apps/drivesetup/AbstractParametersPanel.cpp +++ b/src/apps/drivesetup/AbstractParametersPanel.cpp @@ -136,54 +136,8 @@ AbstractParametersPanel::MessageReceived(BMessage* message) status_t AbstractParametersPanel::Go(BString& parameters) { - // Without an editor, we cannot change anything, anyway - if (fEditor == NULL) { - parameters = ""; - if (fReturnStatus == B_CANCELED) - fReturnStatus = B_OK; - - if (!Lock()) - return B_ERROR; - } else { - // run the window thread, to get an initial layout of the controls - Hide(); - Show(); - if (!Lock()) - return B_CANCELED; - - // center the panel above the parent window - CenterIn(fWindow->Frame()); - - Show(); - Unlock(); - - // block this thread now, but keep the window repainting - while (true) { - status_t status = acquire_sem_etc(fExitSemaphore, 1, - B_CAN_INTERRUPT | B_RELATIVE_TIMEOUT, 50000); - if (status != B_TIMED_OUT && status != B_INTERRUPTED) - break; - fWindow->UpdateIfNeeded(); - } - - if (!Lock()) - return B_CANCELED; - - if (fReturnStatus == B_OK) { - if (fEditor->ValidateParameters()) { - status_t err = fEditor->GetParameters(parameters); - if (err != B_OK) - fReturnStatus = err; - } - } - } - - status_t status = fReturnStatus; - - Quit(); - // NOTE: this object is toast now! - - return status; + BMessage storage; + return Go(parameters, storage); } @@ -240,6 +194,77 @@ AbstractParametersPanel::Init(B_PARAMETER_EDITOR_TYPE type, } +status_t +AbstractParametersPanel::Go(BString& parameters, BMessage& storage) +{ + // Without an editor, we cannot change anything, anyway + if (fEditor == NULL && NeedsEditor()) { + parameters = ""; + if (fReturnStatus == B_CANCELED) + fReturnStatus = B_OK; + + if (!Lock()) + return B_ERROR; + } else { + // run the window thread, to get an initial layout of the controls + Hide(); + Show(); + if (!Lock()) + return B_CANCELED; + + // center the panel above the parent window + CenterIn(fWindow->Frame()); + + Show(); + Unlock(); + + // block this thread now, but keep the window repainting + while (true) { + status_t status = acquire_sem_etc(fExitSemaphore, 1, + B_CAN_INTERRUPT | B_RELATIVE_TIMEOUT, 50000); + if (status != B_TIMED_OUT && status != B_INTERRUPTED) + break; + fWindow->UpdateIfNeeded(); + } + + if (!Lock()) + return B_CANCELED; + + if (fReturnStatus == B_OK) { + if (fEditor != NULL && fEditor->ValidateParameters()) { + status_t status = fEditor->GetParameters(parameters); + if (status != B_OK) + fReturnStatus = status; + } + if (fReturnStatus == B_OK) + fReturnStatus = ParametersReceived(parameters, storage); + } + } + + status_t status = fReturnStatus; + + Quit(); + // NOTE: this object is toast now! + + return status; +} + + +bool +AbstractParametersPanel::NeedsEditor() const +{ + return true; +} + + +status_t +AbstractParametersPanel::ParametersReceived(const BString& parameters, + BMessage& storage) +{ + return B_OK; +} + + void AbstractParametersPanel::AddControls(BLayoutBuilder::Group<>& builder, BView* editorView) diff --git a/src/apps/drivesetup/AbstractParametersPanel.h b/src/apps/drivesetup/AbstractParametersPanel.h index 123e9574c6..9e24a3383d 100644 --- a/src/apps/drivesetup/AbstractParametersPanel.h +++ b/src/apps/drivesetup/AbstractParametersPanel.h @@ -37,7 +37,11 @@ protected: void Init(B_PARAMETER_EDITOR_TYPE type, const BString& diskSystem, BPartition* partition); + status_t Go(BString& parameters, BMessage& storage); + virtual bool NeedsEditor() const; + virtual status_t ParametersReceived(const BString& parameters, + BMessage& storage); virtual void AddControls(BLayoutBuilder::Group<>& builder, BView* editorView); diff --git a/src/apps/drivesetup/CreateParametersPanel.cpp b/src/apps/drivesetup/CreateParametersPanel.cpp index 44baa33492..145809c97c 100644 --- a/src/apps/drivesetup/CreateParametersPanel.cpp +++ b/src/apps/drivesetup/CreateParametersPanel.cpp @@ -60,25 +60,25 @@ status_t CreateParametersPanel::Go(off_t& offset, off_t& size, BString& name, BString& type, BString& parameters) { - // The object will be deleted in Go(), so we need to get the values before + // The object will be deleted in Go(), so we need to get the values via + // a BMessage + + BMessage storage; + status_t status = AbstractParametersPanel::Go(parameters, storage); + if (status != B_OK) + return status; // Return the value back as bytes. - size = fSizeSlider->Size(); - offset = fSizeSlider->Offset(); + size = storage.GetInt64("size", 0); + offset = storage.GetInt64("offset", 0); // get name - name.SetTo(fNameTextControl->Text()); + name.SetTo(storage.GetString("name", NULL)); // get type - if (BMenuItem* item = fTypeMenuField->Menu()->FindMarked()) { - const char* _type; - BMessage* message = item->Message(); - if (!message || message->FindString("type", &_type) < B_OK) - _type = kPartitionTypeBFS; - type << _type; - } + type.SetTo(storage.GetString("type", NULL)); - return AbstractParametersPanel::Go(parameters); + return B_OK; } @@ -114,6 +114,41 @@ CreateParametersPanel::MessageReceived(BMessage* message) } +bool +CreateParametersPanel::NeedsEditor() const +{ + return false; +} + + +status_t +CreateParametersPanel::ParametersReceived(const BString& parameters, + BMessage& storage) +{ + // Return the value back as bytes. + status_t status = storage.SetInt64("size", fSizeSlider->Size()); + if (status == B_OK) + status = storage.SetInt64("offset", fSizeSlider->Offset()); + + // get name + if (status == B_OK) + status = storage.SetString("name", fNameTextControl->Text()); + + // get type + if (BMenuItem* item = fTypeMenuField->Menu()->FindMarked()) { + const char* type; + BMessage* message = item->Message(); + if (!message || message->FindString("type", &type) != B_OK) + type = kPartitionTypeBFS; + + if (status == B_OK) + status = storage.SetString("type", type); + } + + return status; +} + + void CreateParametersPanel::AddControls(BLayoutBuilder::Group<>& builder, BView* editorView) @@ -136,7 +171,8 @@ CreateParametersPanel::AddControls(BLayoutBuilder::Group<>& builder, } } - builder.Add(editorView); + if (editorView != NULL) + builder.Add(editorView); } diff --git a/src/apps/drivesetup/CreateParametersPanel.h b/src/apps/drivesetup/CreateParametersPanel.h index 1ecd8004a6..3ae1ca75d7 100644 --- a/src/apps/drivesetup/CreateParametersPanel.h +++ b/src/apps/drivesetup/CreateParametersPanel.h @@ -33,6 +33,9 @@ public: virtual void MessageReceived(BMessage* message); protected: + virtual bool NeedsEditor() const; + virtual status_t ParametersReceived(const BString& parameters, + BMessage& storage); virtual void AddControls(BLayoutBuilder::Group<>& builder, BView* editorView); From 0ec2317830bf28a4e3f1b14fc7dd47da3bfcb347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 12 Feb 2013 23:09:53 +0100 Subject: [PATCH 03/20] Cleanup. * Removed superfluous redundant comments. --- .../storage/disk_device/DiskSystemAddOn.cpp | 43 ------------------- 1 file changed, 43 deletions(-) diff --git a/src/kits/storage/disk_device/DiskSystemAddOn.cpp b/src/kits/storage/disk_device/DiskSystemAddOn.cpp index 20b6722e01..73171be714 100644 --- a/src/kits/storage/disk_device/DiskSystemAddOn.cpp +++ b/src/kits/storage/disk_device/DiskSystemAddOn.cpp @@ -12,7 +12,6 @@ // #pragma mark - BDiskSystemAddOn -// constructor BDiskSystemAddOn::BDiskSystemAddOn(const char* name, uint32 flags) : fName(name), @@ -21,13 +20,11 @@ BDiskSystemAddOn::BDiskSystemAddOn(const char* name, uint32 flags) } -// destructor BDiskSystemAddOn::~BDiskSystemAddOn() { } -// Name const char* BDiskSystemAddOn::Name() const { @@ -35,7 +32,6 @@ BDiskSystemAddOn::Name() const } -// Flags uint32 BDiskSystemAddOn::Flags() const { @@ -43,7 +39,6 @@ BDiskSystemAddOn::Flags() const } -// CanInitialize bool BDiskSystemAddOn::CanInitialize(const BMutablePartition* partition) { @@ -51,7 +46,6 @@ BDiskSystemAddOn::CanInitialize(const BMutablePartition* partition) } -// GetInitializationParameterEditor status_t BDiskSystemAddOn::GetParameterEditor(B_PARAMETER_EDITOR_TYPE type, BPartitionParameterEditor** editor) @@ -60,7 +54,6 @@ BDiskSystemAddOn::GetParameterEditor(B_PARAMETER_EDITOR_TYPE type, } -// ValidateInitialize status_t BDiskSystemAddOn::ValidateInitialize(const BMutablePartition* partition, BString* name, const char* parameters) @@ -69,7 +62,6 @@ BDiskSystemAddOn::ValidateInitialize(const BMutablePartition* partition, } -// Initialize status_t BDiskSystemAddOn::Initialize(BMutablePartition* partition, const char* name, const char* parameters, BPartitionHandle** handle) @@ -78,7 +70,6 @@ BDiskSystemAddOn::Initialize(BMutablePartition* partition, const char* name, } -// GetTypeForContentType status_t BDiskSystemAddOn::GetTypeForContentType(const char* contentType, BString* type) { @@ -86,7 +77,6 @@ BDiskSystemAddOn::GetTypeForContentType(const char* contentType, BString* type) } -// IsSubSystemFor bool BDiskSystemAddOn::IsSubSystemFor(const BMutablePartition* child) { @@ -97,7 +87,6 @@ BDiskSystemAddOn::IsSubSystemFor(const BMutablePartition* child) // #pragma mark - BPartitionHandle -// constructor BPartitionHandle::BPartitionHandle(BMutablePartition* partition) : fPartition(partition) @@ -105,13 +94,11 @@ BPartitionHandle::BPartitionHandle(BMutablePartition* partition) } -// destructor BPartitionHandle::~BPartitionHandle() { } -// Partition BMutablePartition* BPartitionHandle::Partition() const { @@ -119,7 +106,6 @@ BPartitionHandle::Partition() const } -// SupportedOperations uint32 BPartitionHandle::SupportedOperations(uint32 mask) { @@ -127,7 +113,6 @@ BPartitionHandle::SupportedOperations(uint32 mask) } -// SupportedChildOperations uint32 BPartitionHandle::SupportedChildOperations(const BMutablePartition* child, uint32 mask) @@ -136,7 +121,6 @@ BPartitionHandle::SupportedChildOperations(const BMutablePartition* child, } -// SupportsInitializingChild bool BPartitionHandle::SupportsInitializingChild(const BMutablePartition* child, const char* diskSystem) @@ -145,7 +129,6 @@ BPartitionHandle::SupportsInitializingChild(const BMutablePartition* child, } -// GetNextSupportedType status_t BPartitionHandle::GetNextSupportedType(const BMutablePartition* child, int32* cookie, BString* type) @@ -154,7 +137,6 @@ BPartitionHandle::GetNextSupportedType(const BMutablePartition* child, } -// GetPartitioningInfo status_t BPartitionHandle::GetPartitioningInfo(BPartitioningInfo* info) { @@ -162,7 +144,6 @@ BPartitionHandle::GetPartitioningInfo(BPartitioningInfo* info) } -// Defragment status_t BPartitionHandle::Defragment() { @@ -170,7 +151,6 @@ BPartitionHandle::Defragment() } -// Repair status_t BPartitionHandle::Repair(bool checkOnly) { @@ -178,7 +158,6 @@ BPartitionHandle::Repair(bool checkOnly) } -// ValidateResize status_t BPartitionHandle::ValidateResize(off_t* size) { @@ -186,7 +165,6 @@ BPartitionHandle::ValidateResize(off_t* size) } -// ValidateResizeChild status_t BPartitionHandle::ValidateResizeChild(const BMutablePartition* child, off_t* size) @@ -195,7 +173,6 @@ BPartitionHandle::ValidateResizeChild(const BMutablePartition* child, } -// Resize status_t BPartitionHandle::Resize(off_t size) { @@ -203,7 +180,6 @@ BPartitionHandle::Resize(off_t size) } -// ResizeChild status_t BPartitionHandle::ResizeChild(BMutablePartition* child, off_t size) { @@ -211,7 +187,6 @@ BPartitionHandle::ResizeChild(BMutablePartition* child, off_t size) } -// ValidateMove status_t BPartitionHandle::ValidateMove(off_t* offset) { @@ -221,7 +196,6 @@ BPartitionHandle::ValidateMove(off_t* offset) } -// ValidateMoveChild status_t BPartitionHandle::ValidateMoveChild(const BMutablePartition* child, off_t* offset) @@ -230,7 +204,6 @@ BPartitionHandle::ValidateMoveChild(const BMutablePartition* child, } -// Move status_t BPartitionHandle::Move(off_t offset) { @@ -240,7 +213,6 @@ BPartitionHandle::Move(off_t offset) } -// MoveChild status_t BPartitionHandle::MoveChild(BMutablePartition* child, off_t offset) { @@ -248,7 +220,6 @@ BPartitionHandle::MoveChild(BMutablePartition* child, off_t offset) } -// ValidateSetContentName status_t BPartitionHandle::ValidateSetContentName(BString* name) { @@ -256,7 +227,6 @@ BPartitionHandle::ValidateSetContentName(BString* name) } -// ValidateSetName status_t BPartitionHandle::ValidateSetName(const BMutablePartition* child, BString* name) @@ -265,7 +235,6 @@ BPartitionHandle::ValidateSetName(const BMutablePartition* child, } -// SetContentName status_t BPartitionHandle::SetContentName(const char* name) { @@ -273,7 +242,6 @@ BPartitionHandle::SetContentName(const char* name) } -// SetName status_t BPartitionHandle::SetName(BMutablePartition* child, const char* name) { @@ -281,7 +249,6 @@ BPartitionHandle::SetName(BMutablePartition* child, const char* name) } -// ValidateSetType status_t BPartitionHandle::ValidateSetType(const BMutablePartition* child, const char* type) @@ -290,7 +257,6 @@ BPartitionHandle::ValidateSetType(const BMutablePartition* child, } -// SetType status_t BPartitionHandle::SetType(BMutablePartition* child, const char* type) { @@ -298,7 +264,6 @@ BPartitionHandle::SetType(BMutablePartition* child, const char* type) } -// GetContentParameterEditor status_t BPartitionHandle::GetContentParameterEditor(BPartitionParameterEditor** editor) { @@ -306,7 +271,6 @@ BPartitionHandle::GetContentParameterEditor(BPartitionParameterEditor** editor) } -// GetParameterEditor status_t BPartitionHandle::GetParameterEditor(B_PARAMETER_EDITOR_TYPE type, BPartitionParameterEditor** editor) @@ -315,7 +279,6 @@ BPartitionHandle::GetParameterEditor(B_PARAMETER_EDITOR_TYPE type, } -// ValidateSetContentParameters status_t BPartitionHandle::ValidateSetContentParameters(const char* parameters) { @@ -323,7 +286,6 @@ BPartitionHandle::ValidateSetContentParameters(const char* parameters) } -// ValidateSetParameters status_t BPartitionHandle::ValidateSetParameters(const BMutablePartition* child, const char* parameters) @@ -332,7 +294,6 @@ BPartitionHandle::ValidateSetParameters(const BMutablePartition* child, } -// SetContentParameters status_t BPartitionHandle::SetContentParameters(const char* parameters) { @@ -340,7 +301,6 @@ BPartitionHandle::SetContentParameters(const char* parameters) } -// SetParameters status_t BPartitionHandle::SetParameters(BMutablePartition* child, const char* parameters) @@ -349,7 +309,6 @@ BPartitionHandle::SetParameters(BMutablePartition* child, } -// ValidateCreateChild status_t BPartitionHandle::ValidateCreateChild(off_t* offset, off_t* size, const char* type, BString* name, const char* parameters) @@ -358,7 +317,6 @@ BPartitionHandle::ValidateCreateChild(off_t* offset, off_t* size, } -// CreateChild status_t BPartitionHandle::CreateChild(off_t offset, off_t size, const char* type, const char* name, const char* parameters, BMutablePartition** child) @@ -367,7 +325,6 @@ BPartitionHandle::CreateChild(off_t offset, off_t size, const char* type, } -// DeleteChild status_t BPartitionHandle::DeleteChild(BMutablePartition* child) { From 1b2662019b27ae0e478131506e56d2380d9cf4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 12 Feb 2013 23:26:49 +0100 Subject: [PATCH 04/20] Cleanup. * There is no BDiskSystemAddOn::GetInitializationParameterEditor() method, and it's therefore never being called. --- src/add-ons/disk_systems/gpt/GPTDiskAddOn.cpp | 10 ---------- src/add-ons/disk_systems/gpt/GPTDiskAddOn.h | 3 --- src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp | 10 ---------- src/add-ons/disk_systems/intel/PartitionMapAddOn.h | 3 --- 4 files changed, 26 deletions(-) diff --git a/src/add-ons/disk_systems/gpt/GPTDiskAddOn.cpp b/src/add-ons/disk_systems/gpt/GPTDiskAddOn.cpp index 5fc79e0ecb..92f9488f83 100644 --- a/src/add-ons/disk_systems/gpt/GPTDiskAddOn.cpp +++ b/src/add-ons/disk_systems/gpt/GPTDiskAddOn.cpp @@ -99,16 +99,6 @@ GPTDiskAddOn::CanInitialize(const BMutablePartition* partition) } -status_t -GPTDiskAddOn::GetInitializationParameterEditor( - const BMutablePartition* partition, BPartitionParameterEditor** editor) -{ - // Nothing to edit, really. - *editor = NULL; - return B_OK; -} - - status_t GPTDiskAddOn::ValidateInitialize(const BMutablePartition* partition, BString* name, const char* parameters) diff --git a/src/add-ons/disk_systems/gpt/GPTDiskAddOn.h b/src/add-ons/disk_systems/gpt/GPTDiskAddOn.h index 40349b7f71..da807532f7 100644 --- a/src/add-ons/disk_systems/gpt/GPTDiskAddOn.h +++ b/src/add-ons/disk_systems/gpt/GPTDiskAddOn.h @@ -20,9 +20,6 @@ public: virtual bool CanInitialize( const BMutablePartition* partition); - virtual status_t GetInitializationParameterEditor( - const BMutablePartition* partition, - BPartitionParameterEditor** editor); virtual status_t ValidateInitialize( const BMutablePartition* partition, BString* name, const char* parameters); diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp index f4cbb0aa1e..fa7e617108 100644 --- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp +++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp @@ -97,16 +97,6 @@ PartitionMapAddOn::CanInitialize(const BMutablePartition* partition) } -status_t -PartitionMapAddOn::GetInitializationParameterEditor( - const BMutablePartition* partition, BPartitionParameterEditor** editor) -{ - // Nothing to edit, really. - *editor = NULL; - return B_OK; -} - - status_t PartitionMapAddOn::ValidateInitialize(const BMutablePartition* partition, BString* name, const char* parameters) diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.h b/src/add-ons/disk_systems/intel/PartitionMapAddOn.h index ecd3ea283f..343f3cd227 100644 --- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.h +++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.h @@ -21,9 +21,6 @@ public: virtual bool CanInitialize( const BMutablePartition* partition); - virtual status_t GetInitializationParameterEditor( - const BMutablePartition* partition, - BPartitionParameterEditor** editor); virtual status_t ValidateInitialize( const BMutablePartition* partition, BString* name, const char* parameters); From 8940ad259ab803eff8176766a73f8f531142c3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 12 Feb 2013 23:28:24 +0100 Subject: [PATCH 05/20] DriveSetup: Added support for changing partition parameters. * Does not seem to work yet, though. The intel disk system should support it now, but apparently the partition's delegate is not yet fully initialized for whatever reason. --- .../disk_systems/intel/PartitionMapAddOn.cpp | 3 +- .../drivesetup/AbstractParametersPanel.cpp | 8 +- src/apps/drivesetup/AbstractParametersPanel.h | 1 + src/apps/drivesetup/ChangeParametersPanel.cpp | 196 ++++++++++++ src/apps/drivesetup/ChangeParametersPanel.h | 56 ++++ src/apps/drivesetup/CreateParametersPanel.cpp | 82 +---- src/apps/drivesetup/CreateParametersPanel.h | 14 +- src/apps/drivesetup/Jamfile | 2 + src/apps/drivesetup/MainWindow.cpp | 287 ++++++++++++------ src/apps/drivesetup/MainWindow.h | 7 +- 10 files changed, 484 insertions(+), 172 deletions(-) create mode 100644 src/apps/drivesetup/ChangeParametersPanel.cpp create mode 100644 src/apps/drivesetup/ChangeParametersPanel.h diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp index fa7e617108..1da8e2a9a5 100644 --- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp +++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp @@ -298,7 +298,8 @@ PartitionMapHandle::GetParameterEditor(B_PARAMETER_EDITOR_TYPE type, BPartitionParameterEditor** editor) { *editor = NULL; - if (type == B_CREATE_PARAMETER_EDITOR) { + if (type == B_CREATE_PARAMETER_EDITOR + || type == B_PROPERTIES_PARAMETER_EDITOR) { try { *editor = new PrimaryPartitionEditor(); } catch (std::bad_alloc) { diff --git a/src/apps/drivesetup/AbstractParametersPanel.cpp b/src/apps/drivesetup/AbstractParametersPanel.cpp index b161494eb6..c86b5d3233 100644 --- a/src/apps/drivesetup/AbstractParametersPanel.cpp +++ b/src/apps/drivesetup/AbstractParametersPanel.cpp @@ -200,7 +200,7 @@ AbstractParametersPanel::Go(BString& parameters, BMessage& storage) // Without an editor, we cannot change anything, anyway if (fEditor == NULL && NeedsEditor()) { parameters = ""; - if (fReturnStatus == B_CANCELED) + if (ValidWithoutEditor() && fReturnStatus == B_CANCELED) fReturnStatus = B_OK; if (!Lock()) @@ -257,6 +257,12 @@ AbstractParametersPanel::NeedsEditor() const } +bool +AbstractParametersPanel::ValidWithoutEditor() const +{ + return true; +} + status_t AbstractParametersPanel::ParametersReceived(const BString& parameters, BMessage& storage) diff --git a/src/apps/drivesetup/AbstractParametersPanel.h b/src/apps/drivesetup/AbstractParametersPanel.h index 9e24a3383d..4a83defecd 100644 --- a/src/apps/drivesetup/AbstractParametersPanel.h +++ b/src/apps/drivesetup/AbstractParametersPanel.h @@ -40,6 +40,7 @@ protected: status_t Go(BString& parameters, BMessage& storage); virtual bool NeedsEditor() const; + virtual bool ValidWithoutEditor() const; virtual status_t ParametersReceived(const BString& parameters, BMessage& storage); virtual void AddControls(BLayoutBuilder::Group<>& builder, diff --git a/src/apps/drivesetup/ChangeParametersPanel.cpp b/src/apps/drivesetup/ChangeParametersPanel.cpp new file mode 100644 index 0000000000..978177802a --- /dev/null +++ b/src/apps/drivesetup/ChangeParametersPanel.cpp @@ -0,0 +1,196 @@ +/* + * Copyright 2008-2013 Haiku, Inc. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Authors: + * Stephan Aßmus + * Axel Dörfler, axeld@pinc-software.de. + * Bryce Groff + * Karsten Heimrich + */ + + +#include "ChangeParametersPanel.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Support.h" + + +#undef B_TRANSLATION_CONTEXT +#define B_TRANSLATION_CONTEXT "ChangeParametersPanel" + + +enum { + MSG_PARTITION_TYPE = 'type', +}; + + +ChangeParametersPanel::ChangeParametersPanel(BWindow* window, + BPartition* partition) + : + AbstractParametersPanel(window) +{ + CreateChangeControls(partition); + + Init(B_PROPERTIES_PARAMETER_EDITOR, "", partition); +} + + +ChangeParametersPanel::~ChangeParametersPanel() +{ +} + + +status_t +ChangeParametersPanel::Go(BString& name, BString& type, BString& parameters) +{ + BMessage storage; + return Go(name, type, parameters, storage); +} + + +void +ChangeParametersPanel::MessageReceived(BMessage* message) +{ + switch (message->what) { + case MSG_PARTITION_TYPE: + if (fEditor != NULL) { + const char* type; + if (message->FindString("type", &type) == B_OK) + fEditor->ParameterChanged("type", BVariant(type)); + } + break; + + default: + AbstractParametersPanel::MessageReceived(message); + } +} + + +// #pragma mark - protected + + +ChangeParametersPanel::ChangeParametersPanel(BWindow* window) + : + AbstractParametersPanel(window) +{ +} + + +status_t +ChangeParametersPanel::Go(BString& name, BString& type, BString& parameters, + BMessage& storage) +{ + // The object will be deleted in Go(), so we need to get the values via + // a BMessage + status_t status = AbstractParametersPanel::Go(parameters, storage); + if (status != B_OK) + return status; + + // get name + name.SetTo(storage.GetString("name", NULL)); + + // get type + type.SetTo(storage.GetString("type", NULL)); + + return B_OK; +} + + +void +ChangeParametersPanel::CreateChangeControls(BPartition* parent) +{ + fNameTextControl = new BTextControl("Name Control", + B_TRANSLATE("Partition name:"), "", NULL); + fSupportsName = parent->SupportsChildName(); + + fTypePopUpMenu = new BPopUpMenu("Partition Type"); + + int32 cookie = 0; + BString supportedType; + while (parent->GetNextSupportedChildType(&cookie, &supportedType) == B_OK) { + BMessage* message = new BMessage(MSG_PARTITION_TYPE); + message->AddString("type", supportedType); + BMenuItem* item = new BMenuItem(supportedType, message); + fTypePopUpMenu->AddItem(item); + + if (strcmp(supportedType, kPartitionTypeBFS) == 0) + item->SetMarked(true); + } + + fTypeMenuField = new BMenuField(B_TRANSLATE("Partition type:"), + fTypePopUpMenu); + fSupportsType = fTypePopUpMenu->CountItems() != 0; + + fOkButton->SetLabel(B_TRANSLATE("Change")); +} + + +bool +ChangeParametersPanel::NeedsEditor() const +{ + return !fSupportsName && !fSupportsType; +} + + +bool +ChangeParametersPanel::ValidWithoutEditor() const +{ + return !NeedsEditor(); +} + + +status_t +ChangeParametersPanel::ParametersReceived(const BString& parameters, + BMessage& storage) +{ + // get name + status_t status = storage.SetString("name", fNameTextControl->Text()); + + // get type + if (BMenuItem* item = fTypeMenuField->Menu()->FindMarked()) { + const char* type; + BMessage* message = item->Message(); + if (!message || message->FindString("type", &type) != B_OK) + type = kPartitionTypeBFS; + + if (status == B_OK) + status = storage.SetString("type", type); + } + + return status; +} + + +void +ChangeParametersPanel::AddControls(BLayoutBuilder::Group<>& builder, + BView* editorView) +{ + if (fSupportsName || fSupportsType) { + BLayoutBuilder::Group<>::GridBuilder gridBuilder + = builder.AddGrid(0.0, B_USE_DEFAULT_SPACING); + + if (fSupportsName) { + gridBuilder.Add(fNameTextControl->CreateLabelLayoutItem(), 0, 0) + .Add(fNameTextControl->CreateTextViewLayoutItem(), 1, 0); + } + if (fSupportsType) { + gridBuilder.Add(fTypeMenuField->CreateLabelLayoutItem(), 0, 1) + .Add(fTypeMenuField->CreateMenuBarLayoutItem(), 1, 1); + } + } + + if (editorView != NULL) + builder.Add(editorView); +} diff --git a/src/apps/drivesetup/ChangeParametersPanel.h b/src/apps/drivesetup/ChangeParametersPanel.h new file mode 100644 index 0000000000..54e96c52ce --- /dev/null +++ b/src/apps/drivesetup/ChangeParametersPanel.h @@ -0,0 +1,56 @@ +/* + * Copyright 2008-2013 Haiku Inc. All rights reserved. + * Distributed under the terms of the MIT license. + * + * Authors: + * Stephan Aßmus + * Axel Dörfler, axeld@pinc-software.de. + * Bryce Groff + */ +#ifndef CHANGE_PARAMS_PANEL_H +#define CHANGE_PARAMS_PANEL_H + + +#include "AbstractParametersPanel.h" + + +class BMenuField; +class BPopUpMenu; +class BTextControl; + + +class ChangeParametersPanel : public AbstractParametersPanel { +public: + ChangeParametersPanel(BWindow* window, + BPartition* parent); + virtual ~ChangeParametersPanel(); + + status_t Go(BString& name, BString& type, + BString& parameters); + + virtual void MessageReceived(BMessage* message); + +protected: + ChangeParametersPanel(BWindow* window); + + status_t Go(BString& name, BString& type, + BString& parameters, BMessage& storage); + void CreateChangeControls(BPartition* parent); + + virtual bool NeedsEditor() const; + virtual bool ValidWithoutEditor() const; + virtual status_t ParametersReceived(const BString& parameters, + BMessage& storage); + virtual void AddControls(BLayoutBuilder::Group<>& builder, + BView* editorView); + +protected: + BPopUpMenu* fTypePopUpMenu; + BMenuField* fTypeMenuField; + BTextControl* fNameTextControl; + bool fSupportsName; + bool fSupportsType; +}; + + +#endif // CHANGE_PARAMS_PANEL_H diff --git a/src/apps/drivesetup/CreateParametersPanel.cpp b/src/apps/drivesetup/CreateParametersPanel.cpp index 145809c97c..8f3252b014 100644 --- a/src/apps/drivesetup/CreateParametersPanel.cpp +++ b/src/apps/drivesetup/CreateParametersPanel.cpp @@ -43,9 +43,9 @@ static const uint32 kMegaByte = 0x100000; CreateParametersPanel::CreateParametersPanel(BWindow* window, BPartition* partition, off_t offset, off_t size) : - AbstractParametersPanel(window) + ChangeParametersPanel(window) { - _CreateViewControls(partition, offset, size); + _CreateCreateControls(partition, offset, size); Init(B_CREATE_PARAMETER_EDITOR, "", partition); } @@ -64,7 +64,8 @@ CreateParametersPanel::Go(off_t& offset, off_t& size, BString& name, // a BMessage BMessage storage; - status_t status = AbstractParametersPanel::Go(parameters, storage); + status_t status = ChangeParametersPanel::Go(name, type, parameters, + storage); if (status != B_OK) return status; @@ -72,12 +73,6 @@ CreateParametersPanel::Go(off_t& offset, off_t& size, BString& name, size = storage.GetInt64("size", 0); offset = storage.GetInt64("offset", 0); - // get name - name.SetTo(storage.GetString("name", NULL)); - - // get type - type.SetTo(storage.GetString("type", NULL)); - return B_OK; } @@ -86,14 +81,6 @@ void CreateParametersPanel::MessageReceived(BMessage* message) { switch (message->what) { - case MSG_PARTITION_TYPE: - if (fEditor != NULL) { - const char* type; - if (message->FindString("type", &type) == B_OK) - fEditor->ParameterChanged("type", BVariant(type)); - } - break; - case MSG_SIZE_SLIDER: _UpdateSizeTextControl(); break; @@ -109,7 +96,7 @@ CreateParametersPanel::MessageReceived(BMessage* message) } default: - AbstractParametersPanel::MessageReceived(message); + ChangeParametersPanel::MessageReceived(message); } } @@ -130,22 +117,10 @@ CreateParametersPanel::ParametersReceived(const BString& parameters, if (status == B_OK) status = storage.SetInt64("offset", fSizeSlider->Offset()); - // get name - if (status == B_OK) - status = storage.SetString("name", fNameTextControl->Text()); + if (status != B_OK) + return status; - // get type - if (BMenuItem* item = fTypeMenuField->Menu()->FindMarked()) { - const char* type; - BMessage* message = item->Message(); - if (!message || message->FindString("type", &type) != B_OK) - type = kPartitionTypeBFS; - - if (status == B_OK) - status = storage.SetString("type", type); - } - - return status; + return ChangeParametersPanel::ParametersReceived(parameters, storage); } @@ -157,27 +132,12 @@ CreateParametersPanel::AddControls(BLayoutBuilder::Group<>& builder, .Add(fSizeSlider) .Add(fSizeTextControl); - if (fSupportsName || fSupportsType) { - BLayoutBuilder::Group<>::GridBuilder gridBuilder - = builder.AddGrid(0.0, B_USE_DEFAULT_SPACING); - - if (fSupportsName) { - gridBuilder.Add(fNameTextControl->CreateLabelLayoutItem(), 0, 0) - .Add(fNameTextControl->CreateTextViewLayoutItem(), 1, 0); - } - if (fSupportsType) { - gridBuilder.Add(fTypeMenuField->CreateLabelLayoutItem(), 0, 1) - .Add(fTypeMenuField->CreateMenuBarLayoutItem(), 1, 1); - } - } - - if (editorView != NULL) - builder.Add(editorView); + ChangeParametersPanel::AddControls(builder, editorView); } void -CreateParametersPanel::_CreateViewControls(BPartition* parent, off_t offset, +CreateParametersPanel::_CreateCreateControls(BPartition* parent, off_t offset, off_t size) { // Setup the controls @@ -197,27 +157,7 @@ CreateParametersPanel::_CreateViewControls(BPartition* parent, off_t offset, fSizeTextControl->SetModificationMessage( new BMessage(MSG_SIZE_TEXTCONTROL)); - fNameTextControl = new BTextControl("Name Control", - B_TRANSLATE("Partition name:"), "", NULL); - fSupportsName = parent->SupportsChildName(); - - fTypePopUpMenu = new BPopUpMenu("Partition Type"); - - int32 cookie = 0; - BString supportedType; - while (parent->GetNextSupportedChildType(&cookie, &supportedType) == B_OK) { - BMessage* message = new BMessage(MSG_PARTITION_TYPE); - message->AddString("type", supportedType); - BMenuItem* item = new BMenuItem(supportedType, message); - fTypePopUpMenu->AddItem(item); - - if (strcmp(supportedType, kPartitionTypeBFS) == 0) - item->SetMarked(true); - } - - fTypeMenuField = new BMenuField(B_TRANSLATE("Partition type:"), - fTypePopUpMenu); - fSupportsType = fTypePopUpMenu->CountItems() != 0; + CreateChangeControls(parent); fOkButton->SetLabel(B_TRANSLATE("Create")); } diff --git a/src/apps/drivesetup/CreateParametersPanel.h b/src/apps/drivesetup/CreateParametersPanel.h index 3ae1ca75d7..9d86451b35 100644 --- a/src/apps/drivesetup/CreateParametersPanel.h +++ b/src/apps/drivesetup/CreateParametersPanel.h @@ -11,16 +11,13 @@ #define CREATE_PARAMS_PANEL_H -#include "AbstractParametersPanel.h" +#include "ChangeParametersPanel.h" -class BMenuField; -class BPopUpMenu; -class BTextControl; class SizeSlider; -class CreateParametersPanel : public AbstractParametersPanel { +class CreateParametersPanel : public ChangeParametersPanel { public: CreateParametersPanel(BWindow* window, BPartition* parent, off_t offset, @@ -40,19 +37,14 @@ protected: BView* editorView); private: - void _CreateViewControls(BPartition* parent, + void _CreateCreateControls(BPartition* parent, off_t offset, off_t size); void _UpdateSizeTextControl(); private: - BPopUpMenu* fTypePopUpMenu; - BMenuField* fTypeMenuField; - BTextControl* fNameTextControl; SizeSlider* fSizeSlider; BTextControl* fSizeTextControl; - bool fSupportsName; - bool fSupportsType; }; diff --git a/src/apps/drivesetup/Jamfile b/src/apps/drivesetup/Jamfile index b288480126..7f82eb13eb 100644 --- a/src/apps/drivesetup/Jamfile +++ b/src/apps/drivesetup/Jamfile @@ -6,6 +6,7 @@ UsePrivateHeaders interface shared storage tracker ; Preference DriveSetup : AbstractParametersPanel.cpp + ChangeParametersPanel.cpp CreateParametersPanel.cpp DiskView.cpp DriveSetup.cpp @@ -23,6 +24,7 @@ DoCatalogs DriveSetup : x-vnd.Haiku-DriveSetup : AbstractParametersPanel.cpp + ChangeParametersPanel.cpp CreateParametersPanel.cpp DiskView.cpp InitParametersPanel.cpp diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp index 346a8856ae..30b6c8fbde 100644 --- a/src/apps/drivesetup/MainWindow.cpp +++ b/src/apps/drivesetup/MainWindow.cpp @@ -40,6 +40,7 @@ #include +#include "ChangeParametersPanel.h" #include "CreateParametersPanel.h" #include "DiskView.h" #include "InitParametersPanel.h" @@ -51,6 +52,23 @@ #define B_TRANSLATION_CONTEXT "MainWindow" +enum { + MSG_MOUNT_ALL = 'mnta', + MSG_MOUNT = 'mnts', + MSG_UNMOUNT = 'unmt', + MSG_FORMAT = 'frmt', + MSG_CREATE = 'crtp', + MSG_CHANGE = 'chgp', + MSG_INITIALIZE = 'init', + MSG_DELETE = 'delt', + MSG_EJECT = 'ejct', + MSG_SURFACE_TEST = 'sfct', + MSG_RESCAN = 'rscn', + + MSG_PARTITION_ROW_SELECTED = 'prsl', +}; + + class ListPopulatorVisitor : public BDiskDeviceVisitor { public: ListPopulatorVisitor(PartitionListView* list, int32& diskCount, @@ -96,8 +114,8 @@ private: // add any available space on it BPartitioningInfo info; - status_t ret = partition->GetPartitioningInfo(&info); - if (ret >= B_OK) { + status_t status = partition->GetPartitioningInfo(&info); + if (status >= B_OK) { partition_id parentID = partition->ID(); off_t offset; off_t size; @@ -162,11 +180,11 @@ public: } status_t CommitModifications() { - status_t ret = fDisk->CommitModifications(); - if (ret == B_OK) + status_t status = fDisk->CommitModifications(); + if (status == B_OK) fModificationStatus = B_ERROR; - return ret; + return status; } private: @@ -175,22 +193,6 @@ private: }; -enum { - MSG_MOUNT_ALL = 'mnta', - MSG_MOUNT = 'mnts', - MSG_UNMOUNT = 'unmt', - MSG_FORMAT = 'frmt', - MSG_CREATE = 'crtp', - MSG_INITIALIZE = 'init', - MSG_DELETE = 'delt', - MSG_EJECT = 'ejct', - MSG_SURFACE_TEST = 'sfct', - MSG_RESCAN = 'rscn', - - MSG_PARTITION_ROW_SELECTED = 'prsl', -}; - - // #pragma mark - @@ -217,6 +219,9 @@ MainWindow::MainWindow() fCreateMenuItem = new BMenuItem(B_TRANSLATE("Create" B_UTF8_ELLIPSIS), new BMessage(MSG_CREATE), 'C'); + fChangeMenuItem = new BMenuItem( + B_TRANSLATE("Change parameters" B_UTF8_ELLIPSIS), + new BMessage(MSG_CHANGE)); fDeleteMenuItem = new BMenuItem(B_TRANSLATE("Delete"), new BMessage(MSG_DELETE), 'D'); @@ -249,6 +254,7 @@ MainWindow::MainWindow() fFormatMenu = new BMenu(B_TRANSLATE("Format")); fPartitionMenu->AddItem(fFormatMenu); + fPartitionMenu->AddItem(fChangeMenuItem); fPartitionMenu->AddItem(fDeleteMenuItem); fPartitionMenu->AddSeparatorItem(); @@ -284,10 +290,10 @@ MainWindow::MainWindow() fListView->SetTarget(this); fListView->MakeFocus(true); - status_t ret = fDDRoster.StartWatching(BMessenger(this)); - if (ret != B_OK) { + status_t status = fDiskDeviceRoster.StartWatching(BMessenger(this)); + if (status != B_OK) { fprintf(stderr, "Failed to start watching for device changes: %s\n", - strerror(ret)); + strerror(status)); } // visit all disks in the system and show their contents @@ -323,10 +329,9 @@ MainWindow::MessageReceived(BMessage* message) printf("MSG_FORMAT\n"); break; - case MSG_CREATE: { + case MSG_CREATE: _Create(fCurrentDisk, fCurrentPartitionID); break; - } case MSG_INITIALIZE: { BString diskSystemName; @@ -336,6 +341,10 @@ MainWindow::MessageReceived(BMessage* message) break; } + case MSG_CHANGE: + _ChangeParameters(fCurrentDisk, fCurrentPartitionID); + break; + case MSG_DELETE: _Delete(fCurrentDisk, fCurrentPartitionID); break; @@ -476,7 +485,7 @@ MainWindow::_ScanDrives() fSpaceIDMap.Clear(); int32 diskCount = 0; ListPopulatorVisitor driveVisitor(fListView, diskCount, fSpaceIDMap); - fDDRoster.VisitEachPartition(&driveVisitor); + fDiskDeviceRoster.VisitEachPartition(&driveVisitor); fDiskView->SetDiskCount(diskCount); // restore selection @@ -541,9 +550,9 @@ MainWindow::_SetToDiskAndPartition(partition_id disk, partition_id partition, fCurrentDisk = NULL; if (disk >= 0) { BDiskDevice* newDisk = new BDiskDevice(); - status_t ret = newDisk->SetTo(disk); - if (ret < B_OK) { - printf("error switching disks: %s\n", strerror(ret)); + status_t status = newDisk->SetTo(disk); + if (status != B_OK) { + printf("error switching disks: %s\n", strerror(status)); delete newDisk; } else fCurrentDisk = newDisk; @@ -597,12 +606,13 @@ MainWindow::_UpdateMenus(BDiskDevice* disk, bool prepared = disk->PrepareModifications() == B_OK; fFormatMenu->SetEnabled(prepared); fDeleteMenuItem->SetEnabled(prepared); + fChangeMenuItem->SetEnabled(prepared); BPartition* partition = disk->FindDescendant(selectedPartition); BDiskSystem diskSystem; - fDDRoster.RewindDiskSystems(); - while (fDDRoster.GetNextDiskSystem(&diskSystem) == B_OK) { + fDiskDeviceRoster.RewindDiskSystems(); + while (fDiskDeviceRoster.GetNextDiskSystem(&diskSystem) == B_OK) { if (!diskSystem.SupportsInitializing()) continue; @@ -630,18 +640,20 @@ MainWindow::_UpdateMenus(BDiskDevice* disk, // Mount items if (partition != NULL) { - fFormatMenu->SetEnabled(!partition->IsMounted() + bool notMountedAndWritable = !partition->IsMounted() && !partition->IsReadOnly() - && partition->Device()->HasMedia() + && partition->Device()->HasMedia(); + + fFormatMenu->SetEnabled(notMountedAndWritable && fFormatMenu->CountItems() > 0); - fDiskInitMenu->SetEnabled(!partition->IsMounted() - && !partition->IsReadOnly() - && partition->Device()->HasMedia() + fDiskInitMenu->SetEnabled(notMountedAndWritable && partition->IsDevice() && fDiskInitMenu->CountItems() > 0); - fDeleteMenuItem->SetEnabled(!partition->IsMounted() + fChangeMenuItem->SetEnabled(notMountedAndWritable); + + fDeleteMenuItem->SetEnabled(notMountedAndWritable && !partition->IsDevice()); fMountMenuItem->SetEnabled(!partition->IsMounted()); @@ -660,6 +672,7 @@ MainWindow::_UpdateMenus(BDiskDevice* disk, fUnmountMenuItem->SetEnabled(unMountable); } else { fDeleteMenuItem->SetEnabled(false); + fChangeMenuItem->SetEnabled(false); fMountMenuItem->SetEnabled(false); fFormatMenu->SetEnabled(false); fDiskInitMenu->SetEnabled(false); @@ -672,6 +685,7 @@ MainWindow::_UpdateMenus(BDiskDevice* disk, } if (selectedPartition < 0) { fDeleteMenuItem->SetEnabled(false); + fChangeMenuItem->SetEnabled(false); fMountMenuItem->SetEnabled(false); } } @@ -727,10 +741,10 @@ MainWindow::_Mount(BDiskDevice* disk, partition_id selectedPartition) } if (!partition->IsMounted()) { - status_t ret = partition->Mount(); - if (ret < B_OK) { - _DisplayPartitionError( - B_TRANSLATE("Could not mount partition %s."), partition, ret); + status_t status = partition->Mount(); + if (status != B_OK) { + _DisplayPartitionError(B_TRANSLATE("Could not mount partition %s."), + partition, status); } else { // successful mount, adapt to the changes _ScanDrives(); @@ -761,11 +775,11 @@ MainWindow::_Unmount(BDiskDevice* disk, partition_id selectedPartition) if (partition->IsMounted()) { BPath path; partition->GetMountPoint(&path); - status_t ret = partition->Unmount(); - if (ret < B_OK) { + status_t status = partition->Unmount(); + if (status != B_OK) { _DisplayPartitionError( B_TRANSLATE("Could not unmount partition %s."), - partition, ret); + partition, status); } else { if (dev_for_path(path.Path()) == dev_for_path("/")) rmdir(path.Path()); @@ -784,7 +798,7 @@ void MainWindow::_MountAll() { MountAllVisitor visitor; - fDDRoster.VisitEachPartition(&visitor); + fDiskDeviceRoster.VisitEachPartition(&visitor); } @@ -821,9 +835,9 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, } BDiskSystem diskSystem; - fDDRoster.RewindDiskSystems(); + fDiskDeviceRoster.RewindDiskSystems(); bool found = false; - while (fDDRoster.GetNextDiskSystem(&diskSystem) == B_OK) { + while (fDiskDeviceRoster.GetNextDiskSystem(&diskSystem) == B_OK) { if (diskSystem.SupportsInitializing()) { if (diskSystemName == diskSystem.PrettyName()) { found = true; @@ -874,10 +888,10 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, return; ModificationPreparer modificationPreparer(disk); - status_t ret = modificationPreparer.ModificationStatus(); - if (ret != B_OK) { + status_t status = modificationPreparer.ModificationStatus(); + if (status != B_OK) { _DisplayPartitionError(B_TRANSLATE("There was an error preparing the " - "disk for modifications."), NULL, ret); + "disk for modifications."), NULL, status); return; } @@ -890,21 +904,22 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, bool supportsName = diskSystem.SupportsContentName(); BString validatedName(name); - ret = partition->ValidateInitialize(diskSystem.PrettyName(), + status = partition->ValidateInitialize(diskSystem.PrettyName(), supportsName ? &validatedName : NULL, parameters.String()); - if (ret != B_OK) { + if (status != B_OK) { _DisplayPartitionError(B_TRANSLATE("Validation of the given " - "initialization parameters failed."), partition, ret); + "initialization parameters failed."), partition, status); return; } BString previousName = partition->ContentName(); - ret = partition->Initialize(diskSystem.PrettyName(), + status = partition->Initialize(diskSystem.PrettyName(), supportsName ? validatedName.String() : NULL, parameters.String()); - if (ret != B_OK) { + if (status != B_OK) { _DisplayPartitionError(B_TRANSLATE("Initialization of the partition " - "%s failed. (Nothing has been written to disk.)"), partition, ret); + "%s failed. (Nothing has been written to disk.)"), partition, + status); return; } @@ -947,13 +962,13 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, return; // commit - ret = modificationPreparer.CommitModifications(); + status = modificationPreparer.CommitModifications(); // The partition pointer is toast now! Use the partition ID to // retrieve it again. partition = disk->FindDescendant(selectedPartition); - if (ret == B_OK) { + if (status == B_OK) { if (diskSystem.IsFileSystem()) { _DisplayPartitionError(B_TRANSLATE("The partition %s has been " "successfully formatted.\n"), partition); @@ -964,10 +979,10 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, } else { if (diskSystem.IsFileSystem()) { _DisplayPartitionError(B_TRANSLATE("Failed to format the " - "partition %s!\n"), partition, ret); + "partition %s!\n"), partition, status); } else { _DisplayPartitionError(B_TRANSLATE("Failed to initialize the " - "disk %s!\n"), partition, ret); + "disk %s!\n"), partition, status); } } @@ -1011,10 +1026,10 @@ MainWindow::_Create(BDiskDevice* disk, partition_id selectedPartition) } ModificationPreparer modificationPreparer(disk); - status_t ret = modificationPreparer.ModificationStatus(); - if (ret != B_OK) { + status_t status = modificationPreparer.ModificationStatus(); + if (status != B_OK) { _DisplayPartitionError(B_TRANSLATE("There was an error preparing the " - "disk for modifications."), NULL, ret); + "disk for modifications."), NULL, status); return; } @@ -1040,15 +1055,21 @@ MainWindow::_Create(BDiskDevice* disk, partition_id selectedPartition) CreateParametersPanel* panel = new CreateParametersPanel(this, parent, offset, size); - if (panel->Go(offset, size, name, type, parameters) != B_OK) + status = panel->Go(offset, size, name, type, parameters); + if (status != B_OK) { + if (status != B_CANCELED) { + _DisplayPartitionError(B_TRANSLATE("The panel could not return " + "successfully."), NULL, status); + } return; + } - ret = parent->ValidateCreateChild(&offset, &size, type.String(), + status = parent->ValidateCreateChild(&offset, &size, type.String(), &name, parameters.String()); - if (ret != B_OK) { + if (status != B_OK) { _DisplayPartitionError(B_TRANSLATE("Validation of the given creation " - "parameters failed.")); + "parameters failed."), NULL, status); return; } @@ -1064,27 +1085,27 @@ MainWindow::_Create(BDiskDevice* disk, partition_id selectedPartition) if (choice == 1) return; - ret = parent->CreateChild(offset, size, type.String(), - name.String(), parameters.String()); + status = parent->CreateChild(offset, size, type.String(), name.String(), + parameters.String()); - if (ret != B_OK) { + if (status != B_OK) { _DisplayPartitionError(B_TRANSLATE("Creation of the partition has " - "failed."), NULL, ret); + "failed."), NULL, status); return; } // commit - ret = modificationPreparer.CommitModifications(); + status = modificationPreparer.CommitModifications(); - if (ret != B_OK) { + if (status != B_OK) { _DisplayPartitionError(B_TRANSLATE("Failed to format the " - "partition. No changes have been written to disk."), NULL, ret); + "partition. No changes have been written to disk."), NULL, status); return; } // The disk layout has changed, update disk information bool updated; - ret = disk->Update(&updated); + status = disk->Update(&updated); _ScanDrives(); fDiskView->ForceUpdate(); @@ -1120,10 +1141,10 @@ MainWindow::_Delete(BDiskDevice* disk, partition_id selectedPartition) } ModificationPreparer modificationPreparer(disk); - status_t ret = modificationPreparer.ModificationStatus(); - if (ret != B_OK) { + status_t status = modificationPreparer.ModificationStatus(); + if (status != B_OK) { _DisplayPartitionError(B_TRANSLATE("There was an error preparing the " - "disk for modifications."), NULL, ret); + "disk for modifications."), NULL, status); return; } @@ -1145,18 +1166,112 @@ MainWindow::_Delete(BDiskDevice* disk, partition_id selectedPartition) if (choice == 1) return; - ret = parent->DeleteChild(partition->Index()); - if (ret != B_OK) { - _DisplayPartitionError( - B_TRANSLATE("Could not delete the selected partition."), NULL, ret); + status = parent->DeleteChild(partition->Index()); + if (status != B_OK) { + _DisplayPartitionError(B_TRANSLATE("Could not delete the selected " + "partition."), NULL, status); return; } - ret = modificationPreparer.CommitModifications(); + status = modificationPreparer.CommitModifications(); - if (ret != B_OK) { + if (status != B_OK) { _DisplayPartitionError(B_TRANSLATE("Failed to delete the partition. " - "No changes have been written to disk."), NULL, ret); + "No changes have been written to disk."), NULL, status); + return; + } + + _ScanDrives(); + fDiskView->ForceUpdate(); +} + + +void +MainWindow::_ChangeParameters(BDiskDevice* disk, partition_id selectedPartition) +{ + if (disk == NULL || selectedPartition < 0) { + _DisplayPartitionError(B_TRANSLATE("You need to select a partition " + "entry from the list.")); + return; + } + + if (disk->IsReadOnly()) { + _DisplayPartitionError(B_TRANSLATE("The selected disk is read-only.")); + return; + } + + BPartition* partition = disk->FindDescendant(selectedPartition); + if (partition == NULL) { + _DisplayPartitionError(B_TRANSLATE("Unable to find the selected " + "partition by ID.")); + return; + } + + ModificationPreparer modificationPreparer(disk); + status_t status = modificationPreparer.ModificationStatus(); + if (status != B_OK) { + _DisplayPartitionError(B_TRANSLATE("There was an error preparing the " + "disk for modifications."), NULL, status); + return; + } + + ChangeParametersPanel* panel = new ChangeParametersPanel(this, partition); + + BString name, type, parameters; + status = panel->Go(name, type, parameters); + if (status != B_OK) { + if (status != B_CANCELED) { + _DisplayPartitionError(B_TRANSLATE("The panel experienced a " + "problem!"), NULL, status); + } + // TODO: disk systems without an editor and support for name/type + // changing will return B_CANCELED here -- we need to check this + // before, and disable the menu entry instead + return; + } + + if (partition->CanSetType()) + status = partition->ValidateSetType(type.String()); + if (status == B_OK && partition->CanSetName()) + status = partition->ValidateSetName(&name); + if (status != B_OK) { + _DisplayPartitionError(B_TRANSLATE("Validation of the given parameters " + "failed.")); + return; + } + + // Warn the user one more time... + BAlert* alert = new BAlert("final notice", B_TRANSLATE("Are you sure you " + "want to change parameters of the selected partition?\n\n" + "The partition may no longer be recognized by other operating systems " + "anymore!"), B_TRANSLATE("Change parameters"), B_TRANSLATE("Cancel"), + NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT); + alert->SetShortcut(1, B_ESCAPE); + int32 choice = alert->Go(); + + if (choice == 1) + return; + + if (partition->CanSetType()) + status = partition->SetType(type.String()); + if (status == B_OK && partition->CanSetName()) + status = partition->SetName(name.String()); + if (status == B_OK && partition->CanEditParameters()) + status = partition->SetParameters(parameters.String()); + + if (status != B_OK) { + _DisplayPartitionError( + B_TRANSLATE("Could not change the parameters of the selected " + "partition."), NULL, status); + return; + } + + status = modificationPreparer.CommitModifications(); + + if (status != B_OK) { + _DisplayPartitionError(B_TRANSLATE("Failed to change the parameters " + "of the partition. No changes have been written to disk."), NULL, + status); return; } diff --git a/src/apps/drivesetup/MainWindow.h b/src/apps/drivesetup/MainWindow.h index 26c7df420b..dbf3f593ce 100644 --- a/src/apps/drivesetup/MainWindow.h +++ b/src/apps/drivesetup/MainWindow.h @@ -71,9 +71,11 @@ private: partition_id selectedPartition); void _Delete(BDiskDevice* disk, partition_id selectedPartition); + void _ChangeParameters(BDiskDevice* disk, + partition_id selectedPartition); - - BDiskDeviceRoster fDDRoster; +private: + BDiskDeviceRoster fDiskDeviceRoster; BDiskDevice* fCurrentDisk; partition_id fCurrentPartitionID; @@ -94,6 +96,7 @@ private: BMenuItem* fRescanMenuItem; BMenuItem* fCreateMenuItem; + BMenuItem* fChangeMenuItem; BMenuItem* fDeleteMenuItem; BMenuItem* fMountMenuItem; BMenuItem* fUnmountMenuItem; From a5b3caa295edb4064e3a560bced06ec27770c498 Mon Sep 17 00:00:00 2001 From: Siarzhuk Zharski Date: Tue, 12 Feb 2013 20:14:30 +0100 Subject: [PATCH 06/20] %T placeholder (localized Terminal name) for title mask * %T placeholder added into the set, available for customizing main Terminal window title. It should be typically replaced by the application name localized for the currect system locale. * Use B_TRANSLATE instead of B_TRANSLATE_SYSTEM_NAME for the first menu entry in the main TermWindow menu. The meaning of "Terminal" term in this menu is the "Terminal session" but not the "Terminal Application" so using separate catkeys entry for this menu item avoids this inconsistency in Terminal UI localization; * Fixes #7586 --- src/apps/terminal/PrefHandler.cpp | 2 +- src/apps/terminal/TermConst.cpp | 1 + src/apps/terminal/TermWindow.cpp | 2 +- src/apps/terminal/TitlePlaceholderMapper.cpp | 7 +++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/apps/terminal/PrefHandler.cpp b/src/apps/terminal/PrefHandler.cpp index 7c120f7db4..cf4f469b26 100644 --- a/src/apps/terminal/PrefHandler.cpp +++ b/src/apps/terminal/PrefHandler.cpp @@ -62,7 +62,7 @@ static const pref_defaults kTermDefaults[] = { { PREF_IM_AWARE, "0"}, { PREF_TAB_TITLE, "%1d: %p" }, - { PREF_WINDOW_TITLE, "Terminal %i: %t" }, + { PREF_WINDOW_TITLE, "%T %i: %t" }, { PREF_BLINK_CURSOR, PREF_TRUE }, { PREF_WARN_ON_EXIT, PREF_TRUE }, diff --git a/src/apps/terminal/TermConst.cpp b/src/apps/terminal/TermConst.cpp index f04adb6d63..e3d5efa1c6 100644 --- a/src/apps/terminal/TermConst.cpp +++ b/src/apps/terminal/TermConst.cpp @@ -25,6 +25,7 @@ const char* const kTooTipSetWindowTitlePlaceholders = B_TRANSLATE( "\t%d\t-\tThe current working directory of the active process in the\n" "\t\t\tcurrent tab. Optionally the maximum number of path components\n" "\t\t\tcan be specified. E.g. '%2d' for at most two components.\n" + "\t%T\t-\tThe Terminal application name for the current locale.\n" "\t%i\t-\tThe index of the window.\n" "\t%p\t-\tThe name of the active process in the current tab.\n" "\t%t\t-\tThe title of the current tab.\n" diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp index cd2701fdf6..239201d47e 100644 --- a/src/apps/terminal/TermWindow.cpp +++ b/src/apps/terminal/TermWindow.cpp @@ -465,7 +465,7 @@ TermWindow::_SetupMenu() BLayoutBuilder::Menu<>(fMenuBar = new BMenuBar(Bounds(), "mbar")) // Terminal - .AddMenu(B_TRANSLATE_SYSTEM_NAME("Terminal")) + .AddMenu(B_TRANSLATE("Terminal")) .AddItem(B_TRANSLATE("Switch Terminals"), MENU_SWITCH_TERM, B_TAB) .GetItem(fSwitchTerminalsMenuItem) .AddItem(B_TRANSLATE("New Terminal"), MENU_NEW_TERM, 'N') diff --git a/src/apps/terminal/TitlePlaceholderMapper.cpp b/src/apps/terminal/TitlePlaceholderMapper.cpp index 304270ba76..b5ec9b4138 100644 --- a/src/apps/terminal/TitlePlaceholderMapper.cpp +++ b/src/apps/terminal/TitlePlaceholderMapper.cpp @@ -4,6 +4,8 @@ */ +#include + #include "TitlePlaceholderMapper.h" @@ -80,6 +82,11 @@ WindowTitlePlaceholderMapper::MapPlaceholder(char placeholder, int64 number, bool numberGiven, BString& _string) { switch (placeholder) { + case 'T': + // The Terminal application name for the current locale + _string = B_TRANSLATE_SYSTEM_NAME("Terminal"); + return true; + case 'i': // window index _string.Truncate(0); From 390cd3f7f99c10edef0242c72bd84ef229d5b59e Mon Sep 17 00:00:00 2001 From: Siarzhuk Zharski Date: Wed, 13 Feb 2013 15:00:33 +0100 Subject: [PATCH 07/20] Use B_TRANSLATE_COMMENT for "Terminal[sessions]" sub-menu * Explain the meaning of the "Terminal" menubar entry using B_TRANSLATE_COMMENT with extra info for translators; * Suggested by Oliver. Thank you! --- src/apps/terminal/TermWindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp index 239201d47e..34d047fee4 100644 --- a/src/apps/terminal/TermWindow.cpp +++ b/src/apps/terminal/TermWindow.cpp @@ -465,7 +465,8 @@ TermWindow::_SetupMenu() BLayoutBuilder::Menu<>(fMenuBar = new BMenuBar(Bounds(), "mbar")) // Terminal - .AddMenu(B_TRANSLATE("Terminal")) + .AddMenu(B_TRANSLATE_COMMENT("Terminal", "The title for the main window" + " menubar entry related to terminal sessions")) .AddItem(B_TRANSLATE("Switch Terminals"), MENU_SWITCH_TERM, B_TAB) .GetItem(fSwitchTerminalsMenuItem) .AddItem(B_TRANSLATE("New Terminal"), MENU_NEW_TERM, 'N') From 3722e6400443ac3a57b255188898dab89a5a9aa4 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Wed, 13 Feb 2013 17:52:01 -0500 Subject: [PATCH 08/20] Store and read show/hide clock setting on disk. So that the setting will persist across reboots. This is a Deskbar setting, not a "clock" setting. Theoretically someday if we make it so you can replace the clock with a different clock widget we still want to store whether or not to show the clock widget as a Deskbar setting. Fixes #9456 --- src/apps/deskbar/BarApp.cpp | 7 ++++++- src/apps/deskbar/BarApp.h | 1 + src/apps/deskbar/StatusView.cpp | 21 ++++++++++++++------- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp index 9c12a2798a..afb2451425 100644 --- a/src/apps/deskbar/BarApp.cpp +++ b/src/apps/deskbar/BarApp.cpp @@ -208,7 +208,7 @@ TBarApp::SaveSettings() storedSettings.AddBool("top", fSettings.top); storedSettings.AddInt32("state", fSettings.state); storedSettings.AddFloat("width", fSettings.width); - + storedSettings.AddBool("showClock", fSettings.showClock); storedSettings.AddPoint("switcherLoc", fSettings.switcherLoc); storedSettings.AddInt32("recentAppsCount", fSettings.recentAppsCount); storedSettings.AddInt32("recentDocsCount", fSettings.recentDocsCount); @@ -261,6 +261,7 @@ TBarApp::InitSettings() settings.top = true; settings.state = kExpandoState; settings.width = 0; + settings.showClock = true; settings.switcherLoc = BPoint(5000, 5000); settings.recentAppsCount = 10; settings.recentDocsCount = 10; @@ -328,6 +329,10 @@ TBarApp::InitSettings() } if (storedSettings.FindFloat("width", &settings.width) != B_OK) settings.width = 0; + if (storedSettings.FindBool("showClock", &settings.showClock) + != B_OK) { + settings.showClock = true; + } if (storedSettings.FindPoint("switcherLoc", &settings.switcherLoc) != B_OK) { settings.switcherLoc = BPoint(5000, 5000); diff --git a/src/apps/deskbar/BarApp.h b/src/apps/deskbar/BarApp.h index 86535daa73..40ece977d7 100644 --- a/src/apps/deskbar/BarApp.h +++ b/src/apps/deskbar/BarApp.h @@ -77,6 +77,7 @@ struct desk_settings { bool top; uint32 state; float width; + bool showClock; BPoint switcherLoc; int32 recentAppsCount; int32 recentDocsCount; diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp index b9e6976be6..947773f531 100644 --- a/src/apps/deskbar/StatusView.cpp +++ b/src/apps/deskbar/StatusView.cpp @@ -174,15 +174,17 @@ TReplicantTray::AttachedToWindow() Window()->SetPulseRate(1000000); - // Set clock settings - clock_settings* settings = ((TBarApp*)be_app)->ClockSettings(); - fTime->SetShowSeconds(settings->showSeconds); - fTime->SetShowDayOfWeek(settings->showDayOfWeek); - fTime->SetShowTimeZone(settings->showTimeZone); + clock_settings* clock = ((TBarApp*)be_app)->ClockSettings(); + fTime->SetShowSeconds(clock->showSeconds); + fTime->SetShowDayOfWeek(clock->showDayOfWeek); + fTime->SetShowTimeZone(clock->showTimeZone); AddChild(fTime); fTime->MoveTo(Bounds().right - fTime->Bounds().Width() - 1, 2); + if (!((TBarApp*)be_app)->Settings()->showClock) + fTime->Hide(); + #ifdef DB_ADDONS // load addons and rehydrate archives #if !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) @@ -439,10 +441,15 @@ TReplicantTray::ShowHideTime() RealignReplicants(); AdjustPlacement(); - // message Time preferences to update it's show time setting + bool showClock = !fTime->IsHidden(); + + // Update showClock setting that gets saved to disk on quit + ((TBarApp*)be_app)->Settings()->showClock = showClock; + + // Send a message to Time preferences telling it to update BMessenger messenger("application/x-vnd.Haiku-Time"); BMessage* message = new BMessage(kShowHideTime); - message->AddBool("showClock", !fTime->IsHidden()); + message->AddBool("showClock", showClock); messenger.SendMessage(message); } From 33b9016ddd9ba01103a2854ff08ba52a8d0cda0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 14 Feb 2013 14:31:54 +0100 Subject: [PATCH 09/20] intel disk_system: Renamed file to match class name. * Renamed CreationParameterEditor.(cpp|h) to PrimaryParameterEditor.(cpp|h) as that's what the sole class in there is called. --- src/add-ons/disk_systems/intel/Jamfile | 4 ++-- src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp | 2 +- ...eationParameterEditor.cpp => PrimaryParameterEditor.cpp} | 2 +- .../{CreationParameterEditor.h => PrimaryParameterEditor.h} | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/add-ons/disk_systems/intel/{CreationParameterEditor.cpp => PrimaryParameterEditor.cpp} (97%) rename src/add-ons/disk_systems/intel/{CreationParameterEditor.h => PrimaryParameterEditor.h} (86%) diff --git a/src/add-ons/disk_systems/intel/Jamfile b/src/add-ons/disk_systems/intel/Jamfile index db47924aba..182225ce87 100644 --- a/src/add-ons/disk_systems/intel/Jamfile +++ b/src/add-ons/disk_systems/intel/Jamfile @@ -18,7 +18,7 @@ Addon intel : IntelDiskSystem.cpp ExtendedPartitionAddOn.cpp PartitionMapAddOn.cpp - CreationParameterEditor.cpp + PrimaryParameterEditor.cpp # kernel sources PartitionMap.cpp @@ -29,5 +29,5 @@ Addon intel : DoCatalogs intel : x-vnd.Haiku-IntelDiskAddOn : - CreationParameterEditor.cpp + PrimaryParameterEditor.cpp ; diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp index 1da8e2a9a5..d9c1450048 100644 --- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp +++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp @@ -4,7 +4,6 @@ */ -#include "CreationParameterEditor.h" #include "PartitionMapAddOn.h" #include @@ -17,6 +16,7 @@ #include #include "IntelDiskSystem.h" +#include "PrimaryParameterEditor.h" //#define TRACE_PARTITION_MAP_ADD_ON diff --git a/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp similarity index 97% rename from src/add-ons/disk_systems/intel/CreationParameterEditor.cpp rename to src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp index 75c3819b9e..0d89a9cfbf 100644 --- a/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp +++ b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp @@ -5,7 +5,7 @@ */ -#include "CreationParameterEditor.h" +#include "PrimaryParameterEditor.h" #include #include diff --git a/src/add-ons/disk_systems/intel/CreationParameterEditor.h b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.h similarity index 86% rename from src/add-ons/disk_systems/intel/CreationParameterEditor.h rename to src/add-ons/disk_systems/intel/PrimaryParameterEditor.h index e165560668..fad1f1caed 100644 --- a/src/add-ons/disk_systems/intel/CreationParameterEditor.h +++ b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.h @@ -3,8 +3,8 @@ * Copyright 2009, Bryce Groff, brycegroff@gmail.com. * Distributed under the terms of the MIT License. */ -#ifndef _CREATION_PARAMETER_EDITOR -#define _CREATION_PARAMETER_EDITOR +#ifndef _PRIMARY_PARAMETER_EDITOR +#define _PRIMARY_PARAMETER_EDITOR #include @@ -32,4 +32,4 @@ private: }; -#endif // _CREATION_PARAMETER_EDITOR +#endif // _PRIMARY_PARAMETER_EDITOR From 2d1523c61d3386f0ac4d6d679c3670211b6fba14 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Thu, 14 Feb 2013 17:29:41 +0100 Subject: [PATCH 10/20] Removed the help menu from Magnify (#5012) No other Haiku app has a help menu, we have the user guide for that. One time we may want to link the appropriate user guide page into all apps... --- src/apps/magnify/Magnify.cpp | 86 ------------------------------------ src/apps/magnify/Magnify.h | 2 - 2 files changed, 88 deletions(-) diff --git a/src/apps/magnify/Magnify.cpp b/src/apps/magnify/Magnify.cpp index 954196a2ff..091d1ad80c 100644 --- a/src/apps/magnify/Magnify.cpp +++ b/src/apps/magnify/Magnify.cpp @@ -40,7 +40,6 @@ #define B_TRANSLATION_CONTEXT "Magnify-Main" -const int32 msg_help = 'help'; const int32 msg_update_info = 'info'; const int32 msg_show_info = 'show'; const int32 msg_toggle_grid = 'grid'; @@ -131,11 +130,6 @@ static void BuildInfoMenu(BMenu *menu) { BMenuItem* menuItem; - menuItem = new BMenuItem(B_TRANSLATE("Help"), - new BMessage(msg_help)); - menu->AddItem(menuItem); - menu->AddSeparatorItem(); - menuItem = new BMenuItem(B_TRANSLATE("Save image"), new BMessage(msg_save),'S'); menu->AddItem(menuItem); @@ -256,10 +250,6 @@ TWindow::MessageReceived(BMessage* m) bool active = fFatBits->Active(); switch (m->what) { - case msg_help: - ShowHelp(); - break; - case msg_show_info: if (active) ShowInfo(!fShowInfo); @@ -751,82 +741,6 @@ TWindow::PixelSize() } -#undef B_TRANSLATION_CONTEXT -#define B_TRANSLATION_CONTEXT "Magnify-Help" - - -void -TWindow::ShowHelp() -{ - BRect r(0, 0, 450, 240); - BWindow* w = new BWindow(r, B_TRANSLATE("Magnify help"), B_TITLED_WINDOW, - B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE); - - r.right -= B_V_SCROLL_BAR_WIDTH; - r.bottom -= B_H_SCROLL_BAR_HEIGHT; - BRect r2(r); - r2.InsetBy(4, 4); - BTextView* text = new BTextView(r, "text", r2, B_FOLLOW_ALL, B_WILL_DRAW); - text->MakeSelectable(false); - text->MakeEditable(false); - - BScrollView* scroller = new BScrollView("", text, B_FOLLOW_ALL, 0, true, true); - w->AddChild(scroller); - - text->Insert(B_TRANSLATE( - "General:\n" - " 32 x 32 - the top left numbers are the number of visible\n" - " pixels (width x height)\n" - " 8 pixels/pixel - represents the number of pixels that are\n" - " used to magnify a pixel\n" - " R:152 G:52 B:10 - the RGB values for the pixel under\n" - " the red square\n")); - text->Insert("\n\n"); - text->Insert(B_TRANSLATE( - "Copy/Save:\n" - " copy - copies the current image to the clipboard\n" - " save - prompts the user for a file to save to and writes out\n" - " the bits of the image\n")); - text->Insert("\n\n"); - text->Insert(B_TRANSLATE( - "Info:\n" - " hide/show info - hides/shows all these new features\n" - " note: when showing, a red square will appear which signifies\n" - " which pixel's rgb values will be displayed\n" - " add/remove crosshairs - 2 crosshairs can be added (or removed)\n" - " to aid in the alignment and placement of objects.\n" - " The crosshairs are represented by blue squares and blue lines.\n" - " hide/show grid - hides/shows the grid that separates each pixel\n" - )); - text->Insert("\n\n"); - text->Insert(B_TRANSLATE( - " freeze - freezes/unfreezes magnification of whatever the\n" - " cursor is currently over\n")); - text->Insert("\n\n"); - text->Insert(B_TRANSLATE( - "Sizing/Resizing:\n" - " make square - sets the width and the height to the larger\n" - " of the two making a square image\n" - " increase/decrease window size - grows or shrinks the window\n" - " size by 4 pixels.\n" - " note: this window can also be resized to any size via the\n" - " resizing region of the window\n" - " increase/decrease pixel size - increases or decreases the number\n" - " of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n")); - text->Insert("\n\n"); - text->Insert(B_TRANSLATE( - "Navigation:\n" - " arrow keys - move the current selection " - "(rgb indicator or crosshair)\n" - " around 1 pixel at a time\n" - " option-arrow key - moves the mouse location 1 pixel at a time\n" - " x marks the selection - the current selection has an 'x' in it\n")); - - w->CenterOnScreen(); - w->Show(); -} - - #undef B_TRANSLATION_CONTEXT #define B_TRANSLATION_CONTEXT "Magnify-Main" diff --git a/src/apps/magnify/Magnify.h b/src/apps/magnify/Magnify.h index 2e3e7a4e83..44c9f82e68 100644 --- a/src/apps/magnify/Magnify.h +++ b/src/apps/magnify/Magnify.h @@ -230,8 +230,6 @@ class TWindow : public BWindow { void SetPixelSize(bool); int32 PixelSize(); - void ShowHelp(); - bool IsActive(); private: From b3247c59feaf0fa16e8ce009d675e166c8ca4f89 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Thu, 14 Feb 2013 14:13:00 -0500 Subject: [PATCH 11/20] Update BAboutWindow to use B_CLOSE_ON_ESCAPE flag. --- src/kits/shared/AboutWindow.cpp | 44 +-------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/src/kits/shared/AboutWindow.cpp b/src/kits/shared/AboutWindow.cpp index 350968d190..81e5139589 100644 --- a/src/kits/shared/AboutWindow.cpp +++ b/src/kits/shared/AboutWindow.cpp @@ -45,46 +45,6 @@ using BPrivate::gSystemCatalog; #define B_TRANSLATION_CONTEXT "AboutWindow" -class EscapeFilter : public BMessageFilter { - public: - EscapeFilter(BWindow* target) - : - BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE), - fTarget(target) - { - } - virtual ~EscapeFilter() - { - } - virtual filter_result - Filter(BMessage* message, BHandler** target) - { - filter_result result = B_DISPATCH_MESSAGE; - switch (message->what) { - case B_KEY_DOWN: - case B_UNMAPPED_KEY_DOWN: { - uint32 key; - if (message->FindInt32("raw_char", - (int32*)&key) >= B_OK) { - if (key == B_ESCAPE) { - result = B_SKIP_MESSAGE; - fTarget->PostMessage( - B_QUIT_REQUESTED); - } - } - break; - } - default: - break; - } - - return result; - } - private: - BWindow* fTarget; -}; - - class StripeView : public BView { public: StripeView(BBitmap* icon); @@ -394,7 +354,7 @@ AboutView::SetIcon(BBitmap* icon) BAboutWindow::BAboutWindow(const char* appName, const char* signature) : BWindow(BRect(0.0, 0.0, 200.0, 200.0), appName, B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE - | B_AUTO_UPDATE_SIZE_LIMITS) + | B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE) { SetLayout(new BGroupLayout(B_VERTICAL)); @@ -409,8 +369,6 @@ BAboutWindow::BAboutWindow(const char* appName, const char* signature) AddChild(fAboutView); MoveTo(AboutPosition(Frame().Width(), Frame().Height())); - - AddCommonFilter(new EscapeFilter(this)); } From 6d287908b15e883d38d450ccc8a0a2335383acba Mon Sep 17 00:00:00 2001 From: John Scipione Date: Thu, 14 Feb 2013 19:35:48 -0500 Subject: [PATCH 12/20] Fix warning and cleanup for BPath docs --- docs/user/storage/Path.dox | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/user/storage/Path.dox b/docs/user/storage/Path.dox index 47b679ae40..64929f4ce4 100644 --- a/docs/user/storage/Path.dox +++ b/docs/user/storage/Path.dox @@ -81,7 +81,6 @@ - The presence of "." or ".." ("/boot/ltj/../ltj/./gwar") - Redundant slashes ("/boot//ltj") - A trailing slash ("/boot/ltj/") - */ @@ -106,7 +105,7 @@ /*! \fn BPath::~BPath() - \brief Destroys the BPath object and frees any of its associated resources. + \brief Destroys the BPath object and frees any associated resources. */ @@ -456,7 +455,7 @@ The type code must be set to \c B_REF_TYPE. \param code The type code of the flattened data, must be \c B_REF_TYPE. - \param buf A pointer to the flattened data. + \param buffer A pointer to a buffer containing the flattened data. \param size The size of \a buffer in bytes. \returns A status code. From 0a9ac70aeaf2ced3be4b252416d7e68972c7f5ce Mon Sep 17 00:00:00 2001 From: John Scipione Date: Thu, 14 Feb 2013 19:36:33 -0500 Subject: [PATCH 13/20] Move BQuery docs into Haiku Book. ... removing the docs from the .cpp and .h files and cleaning up as usual. --- docs/user/storage/Query.dox | 547 ++++++++++++++++++++++++++++++++++++ headers/os/storage/Query.h | 11 - src/kits/storage/Query.cpp | 359 +++-------------------- 3 files changed, 580 insertions(+), 337 deletions(-) create mode 100644 docs/user/storage/Query.dox diff --git a/docs/user/storage/Query.dox b/docs/user/storage/Query.dox new file mode 100644 index 0000000000..07239bbf19 --- /dev/null +++ b/docs/user/storage/Query.dox @@ -0,0 +1,547 @@ +/* + * Copyright 2002-2013 Haiku Inc. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Tyler Dauwalder + * Axel Dörfler, axeld@pinc-software.de + * John Scipione, jscipione@gmail.com + * Ingo Weinhold, bonefish@users.sf.net + * + * Corresponds to: + * headers/os/storage/Query.h hrev45283 + * src/kits/storage/Query.cpp hrev45283 + */ + + +/*! + \file Query.h + \ingroup storage + \ingroup libbe + Provides the BQuery class. +*/ + + +/*! + \class BQuery + \ingroup storage + \ingroup libbe + \brief Provides an interface for creating file system queries and + implements BEntryList methods for iterating through the results. +*/ + + +/*! + \fn BQuery::BQuery() + \brief Creates an uninitialized BQuery object. + + \see SetPredicate() +*/ + + +/*! + \fn BQuery::~BQuery() + \brief Destroys the BQuery object and frees any associated resources. +*/ + + +/*! + \fn status_t BQuery::Clear() + \brief Resets the object to a uninitialized state. + + \return \c B_OK +*/ + + +/*! + \fn status_t BQuery::Fetch() + \brief Start fetching entries satisfying the predicate. + + After Fetch() has been called GetNextEntry(), GetNextRef() and + GetNextDirents() can be used to retrieve the entities. Live query updates + may be sent immediately after this method has been called. + + Fetch() fails if it has already been called. To reuse the BQuery object it + must first be reset with the Clear() method. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_INIT The object predicate or the volume wasn't set. + \retval B_BAD_VALUE The object predicate was invalid. + \retval B_NOT_ALLOWED Fetch() already called. +*/ + + +/*! + \name Predicate push methods + + Methods to push data onto the predicate stack. + + \warning In BeOS R5 these methods returned \c void. That is checking the + return value will render your code source and binary + incompatible! Calling PushXYZ() after a Fetch() does change the + predicate on R5, but it doesn't affect the active query and the + newly created predicate can not even be used for the next query, + since in order to be able to reuse the BQuery object for another + query, Clear() has to be called and Clear() also deletes the + predicate. +*/ + + +//! @{ + + +/*! + \fn status_t BQuery::PushAttr(const char* attrName) + \brief Pushes an attribute name onto the predicate stack. + + \param attrName The name of the attribute to push on the stack. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushAttribute() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::PushOp(query_op op) + \brief Pushes an operator onto the predicate stack. + + \param op The operator code to push onto the stack. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushOp() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::PushUInt32(uint32 value) + \brief Pushes a \c uint32 onto the predicate stack. + + \param value The \c uint32 to push onto the stack. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushUInt32() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::PushInt32(int32 value) + \brief Pushes an \c int32 onto the predicate stack. + + \param value The \c int32 to push onto the stack. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushInt32() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::PushUInt64(uint64 value) + \brief Pushes a \c uint64 onto the predicate stack. + + \param value The \c uint64 to push onto the stack. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushUInt64() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::PushInt64(int64 value) + \brief Pushes an int64 onto the predicate stack. + + \param value The \c int64 to push onto the stack. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushInt64() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::PushFloat(float value) + \brief Pushes a \c float onto the predicate stack. + + \param value The \c float to push onto the stack. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushFloat() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::PushDouble(double value) + \brief Pushes a \c double onto the predicate stack. + + \param value The \c double to push onto the stack. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushDouble() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::PushString(const char* value, bool caseInsensitive) + \brief Pushes a string onto the predicate stack. + + \param value The string to push onto the stack. + \param caseInsensitive Whether or not the case of \a value should be + ignored in the resulting query. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushString() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::PushDate(const char* date) + \brief Pushes a date string onto the predicate stack. + + The supplied date can be any string understood by parsedate(). + + \param date The date string to push onto the stack. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED PushDate() was called after Fetch(). + + \see parsedate() +*/ + + +//! @} + + +/*! + \name Assignment methods +*/ + + +//! @{ + + +/*! + \fn status_t BQuery::SetVolume(const BVolume* volume) + \brief Assigns \a volume to the BQuery object. + + A query may only be assigned to one volume. + + The method fails if called after Fetch(). To reuse the BQuery object it + must first be reset using the Clear() method. + + \param volume The \a volume to set. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NOT_ALLOWED SetVolume() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::SetPredicate(const char* expression) + \brief Assigns the passed-in predicate \a expression. + + A predicate can be set either using this method or by constructing one on + the predicate stack, however, the two methods can not be mixed. The + predicate stack takes precedence over this method. + + The method fails if called after Fetch(). To reuse the BQuery object it + must first be reset using the Clear() method. + + \param expression The predicate \a expression to set. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED SetPredicate() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::SetTarget(BMessenger messenger) + \brief Assigns the target \a messenger and makes the query live. + + The query update messages are sent to the specified target. They might + roll in immediately after calling Fetch(). + + This methods fails if called after Fetch(). To reuse the BQuery object it + must first be reset via Clear(). + + \param messenger The target \a messenger to set. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY Not enough memory. + \retval B_NOT_ALLOWED SetTarget() was called after Fetch(). +*/ + + +//! @} + + +/*! + \name Query information methods +*/ + + +//! @{ + + +/*! + \fn bool BQuery::IsLive() const + \brief Gets whether the query associated with this object is live. + \return \c true, if the query is live, \c false otherwise. +*/ + + +/*! + \fn dev_t BQuery::TargetDevice() const + \brief Gets the device ID identifying the volume of the BQuery object. + + \return The device ID of the volume or \c B_NO_INIT if the volume wasn't + set. +*/ + + +/*! + \fn size_t BQuery::PredicateLength() + \brief Gets the length of the predicate string. + + This method returns the length of the string representation of the + predicate (including the terminating \c NUL) regardless of whether the + predicate has been constructed using the predicate stack or set via + SetPredicate(). + + \return The length of the predicate string or 0 if an error occurred. +*/ + + +//! @} + + +/*! + \name Get predicate methods + + These methods fetch a string representation regardless of whether the + predicate has been constructed using the predicate stack or via + SetPredicate(). + + \note These methods cause the predicate stack to be evaluated and cleared. + You can't interleave calls to push data and GetPredicate() methods. +*/ + + +//! @{ + + +/*! + \fn status_t BQuery::GetPredicate(char* buffer, size_t length) + \brief Fills out \a buffer with the predicate string assigned to the + BQuery object. + + \param buffer A pointer to a buffer which the predicate is written to. + \param length the size of \a buffer. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_INIT The predicate of the BQuery object wasn't set. + \retval B_BAD_VALUE \a buffer was \c NULL or too short. +*/ + + +/*! + \fn status_t BQuery::GetPredicate(BString* predicate) + \brief Fills out the passed-in BString object with the predicate string + assigned to the BQuery object. + + \param predicate A pointer to a BString object that gets filled out with + the predicate string. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_INIT The predicate of the BQuery object wasn't set. + \retval B_BAD_VALUE \a predicate was \c NULL. +*/ + + +//! @} + + +/*! + \name BEntryList interface methods + + These methods are used to traverse the results of a query as a BEntryList. + + \note The iterator used by these methods is the same one used by + GetNextRef() and GetNextDirents(). +*/ + + +//! @{ + + +/*! + \fn status_t BQuery::GetNextEntry(BEntry* entry, bool traverse) + \brief Fills out \a entry with the next entry traversing symlinks if + \a traverse is \c true. + + \param entry A pointer to a BEntry object initialized with the entry. + \param traverse Whether or not to follow symbolic links. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_ENTRY_NOT_FOUND At end of list. + \retval B_BAD_VALUE The predicate included unindexed attributes. + \retval B_NOT_ALLOWED Fetch() was not previously called on the object. +*/ + + +/*! + \fn status_t BQuery::GetNextRef(entry_ref* ref) + \brief Fills out \a ref with the next entry as an entry_ref. + + \param ref A pointer to an entry_ref object filled out with the + entry's data. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_ENTRY_NOT_FOUND At end of list. + \retval B_BAD_VALUE The predicate included unindexed attributes. + \retval B_NOT_ALLOWED Fetch() was not previously called on the object. +*/ + + +/*! + \fn int32 BQuery::GetNextDirents(struct dirent* buffer, size_t length, + int32 count) + \brief Fill out up to \a count entries into the array of dirent structs + pointed to by \a buffer. + + Reads as many but no more than \a count entries, as many entries as + remain, or as many entries as will fit into the array at \a buffer with + the given \a length (in bytes), whichever is smallest. + + \param buffer A pointer to a buffer filled out with dirent structures of + the entries. + \param length The length of \a buffer. + \param count The maximum number of entries to be read. + + \return The number of dirent structures stored in the buffer, 0 when there + are no more entries to be read, or an error code. + \retval B_BAD_VALUE The predicate included unindexed attributes. + \retval B_FILE_ERROR Fetch() was not previously called on the object. +*/ + + +/*! + \fn status_t BQuery::Rewind() + \brief Rewinds the entry list back to the first entry. + + \note BeOS R5 does not implement this method for BQuery. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_FILE_ERROR Fetch() was not previously called on the object. +*/ + + +/*! + \fn int32 BQuery::CountEntries() + \brief Unimplemented. + + \return \c B_ERROR. +*/ + + +//! @} + + +/// private methods, won't show up in docs + + +/*! + \fn bool BQuery::_HasFetched() const + \brief Gets whether Fetch() has already been called on this object. + + \return \c true, if Fetch() was already called, \c false otherwise. +*/ + + +/*! + \fn status_t BQuery::_PushNode(QueryNode* node, bool deleteOnError) + \brief Pushes a node onto the predicate stack. + + If the stack has not been allocate until this time, this method does + allocate it. + + If the supplied node is \c NULL, it is assumed that there was not enough + memory to allocate the node and thus \c B_NO_MEMORY is returned. + + In case the method fails, the caller retains the ownership of the supplied + node and thus is responsible for deleting it, if \a deleteOnError is + \c false. If it is \c true, the node is deleted, if an error occurs. + + \param node The node to push. + \param deleteOnError Whether or not to delete the node if an error occurs. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY \a node was \c NULL or there was insufficient memory to + allocate the predicate stack or push the node. + \retval B_NOT_ALLOWED _PushNode() was called after Fetch(). +*/ + + +/*! + \fn status_t BQuery::_SetPredicate(const char* expression) + \brief Helper method to set the predicate. + + Does not check whether Fetch() has already been invoked. + + \param expression The predicate string to set. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY There was insufficient memory to store the predicate. +*/ + + +/*! + \fn status_t BQuery::_EvaluateStack() + Evaluates the predicate stack. + + The method does nothing (and returns \c B_OK), if the stack is \c NULL. + If the stack is not \c null and Fetch() has already been called, this + method fails. + + \return A status code. + \retval B_OK Everything went fine. + \retval B_NO_MEMORY There was insufficient memory. + \retval B_NOT_ALLOWED _EvaluateStack() was called after Fetch(). +*/ + + +/*! + \fn void BQuery::_ParseDates(BString& parsedPredicate) + \brief Fills out \a parsedPredicate with a parsed predicate string. + + \param parsedPredicate The predicate string to fill out. +*/ diff --git a/headers/os/storage/Query.h b/headers/os/storage/Query.h index cb07dcd921..fff4c7522d 100644 --- a/headers/os/storage/Query.h +++ b/headers/os/storage/Query.h @@ -40,17 +40,6 @@ typedef enum { } query_op; -/*! - \class BQuery - \brief Represents a live or non-live file system query - - Provides an interface for creating file system queries. Implements - the BEntryList for iterating through the found entries. - - \author Ingo Weinhold - - \version 0.0.0 -*/ class BQuery : public BEntryList { public: BQuery(); diff --git a/src/kits/storage/Query.cpp b/src/kits/storage/Query.cpp index 990331cea2..64187511e7 100644 --- a/src/kits/storage/Query.cpp +++ b/src/kits/storage/Query.cpp @@ -32,8 +32,7 @@ using namespace std; using namespace BPrivate::Storage; -/*! \brief Creates an uninitialized BQuery. -*/ +// Creates an uninitialized BQuery. BQuery::BQuery() : BEntryList(), @@ -48,17 +47,14 @@ BQuery::BQuery() } -/*! \brief Frees all resources associated with the object. -*/ +// Frees all resources associated with the object. BQuery::~BQuery() { Clear(); } -/*! \brief Resets the object to a uninitialized state. - \return \c B_OK -*/ +// Resets the object to a uninitialized state. status_t BQuery::Clear() { @@ -82,20 +78,7 @@ BQuery::Clear() } -/*! \brief Pushes an attribute name onto the BQuery's predicate stack. - \param attrName the attribute name - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Not enough memory. - - \c B_NOT_ALLOWED: PushAttribute() was called after Fetch(). - \note In BeOS R5 this method returns \c void. That is checking the return - value will render your code source and binary incompatible! - Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes an attribute name onto the predicate stack. status_t BQuery::PushAttr(const char* attrName) { @@ -103,20 +86,7 @@ BQuery::PushAttr(const char* attrName) } -/*! \brief Pushes an operator onto the BQuery's predicate stack. - \param op the code representing the operator - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Not enough memory. - - \c B_NOT_ALLOWED: PushOp() was called after Fetch(). - \note In BeOS R5 this method returns \c void. That is checking the return - value will render your code source and binary incompatible! - Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes an operator onto the predicate stack. status_t BQuery::PushOp(query_op op) { @@ -146,20 +116,7 @@ BQuery::PushOp(query_op op) } -/*! \brief Pushes a uint32 value onto the BQuery's predicate stack. - \param value the value - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Not enough memory. - - \c B_NOT_ALLOWED: PushUInt32() was called after Fetch(). - \note In BeOS R5 this method returns \c void. That is checking the return - value will render your code source and binary incompatible! - Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes a uint32 onto the predicate stack. status_t BQuery::PushUInt32(uint32 value) { @@ -167,20 +124,7 @@ BQuery::PushUInt32(uint32 value) } -/*! \brief Pushes an int32 value onto the BQuery's predicate stack. - \param value the value - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Not enough memory. - - \c B_NOT_ALLOWED: PushInt32() was called after Fetch(). - \note In BeOS R5 this method returns \c void. That is checking the return - value will render your code source and binary incompatible! - Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes an int32 onto the predicate stack. status_t BQuery::PushInt32(int32 value) { @@ -188,20 +132,7 @@ BQuery::PushInt32(int32 value) } -/*! \brief Pushes a uint64 value onto the BQuery's predicate stack. - \param value the value - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Not enough memory. - - \c B_NOT_ALLOWED: PushUInt64() was called after Fetch(). - \note In BeOS R5 this method returns \c void. That is checking the return - value will render your code source and binary incompatible! - Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes a uint64 onto the predicate stack. status_t BQuery::PushUInt64(uint64 value) { @@ -209,20 +140,7 @@ BQuery::PushUInt64(uint64 value) } -/*! \brief Pushes an int64 value onto the BQuery's predicate stack. - \param value the value - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Not enough memory. - - \c B_NOT_ALLOWED: PushInt64() was called after Fetch(). - \note In BeOS R5 this method returns \c void. That is checking the return - value will render your code source and binary incompatible! - Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes an int64 onto the predicate stack. status_t BQuery::PushInt64(int64 value) { @@ -230,20 +148,7 @@ BQuery::PushInt64(int64 value) } -/*! \brief Pushes a float value onto the BQuery's predicate stack. - \param value the value - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Not enough memory. - - \c B_NOT_ALLOWED: PushFloat() was called after Fetch(). - \note In BeOS R5 this method returns \c void. That is checking the return - value will render your code source and binary incompatible! - Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes a float onto the predicate stack. status_t BQuery::PushFloat(float value) { @@ -251,20 +156,7 @@ BQuery::PushFloat(float value) } -/*! \brief Pushes a double value onto the BQuery's predicate stack. - \param value the value - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Not enough memory. - - \c B_NOT_ALLOWED: PushDouble() was called after Fetch(). - \note In BeOS R5 this method returns \c void. That is checking the return - value will render your code source and binary incompatible! - Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes a double onto the predicate stack. status_t BQuery::PushDouble(double value) { @@ -272,22 +164,7 @@ BQuery::PushDouble(double value) } -/*! \brief Pushes a string value onto the BQuery's predicate stack. - \param value the value - \param caseInsensitive \c true, if the case of the string should be - ignored, \c false otherwise - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Not enough memory. - - \c B_NOT_ALLOWED: PushString() was called after Fetch(). - \note In BeOS R5 this method returns \c void. That is checking the return - value will render your code source and binary incompatible! - Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes a string onto the predicate stack. status_t BQuery::PushString(const char* value, bool caseInsensitive) { @@ -295,20 +172,7 @@ BQuery::PushString(const char* value, bool caseInsensitive) } -/*! \brief Pushes a date value onto the BQuery's predicate stack. - The supplied date can be any string understood by the POSIX function - parsedate(). - \param date the date string - \return - - \c B_OK: Everything went fine. - - \c B_ERROR: Error parsing the string. - - \c B_NOT_ALLOWED: PushDate() was called after Fetch(). - \note Calling PushXYZ() after a Fetch() does change the predicate on R5, - but it doesn't affect the active query and the newly created - predicate can not even be used for the next query, since in order - to be able to reuse the BQuery object for another query, Clear() has - to be called and Clear() also deletes the predicate. -*/ +// Pushes a date onto the predicate stack. status_t BQuery::PushDate(const char* date) { @@ -319,15 +183,7 @@ BQuery::PushDate(const char* date) } -/*! \brief Sets the BQuery's volume. - A query is restricted to one volume. This method sets this volume. It - fails, if called after Fetch(). To reuse a BQuery object it has to be - reset via Clear(). - \param volume the volume - \return - - \c B_OK: Everything went fine. - - \c B_NOT_ALLOWED: SetVolume() was called after Fetch(). -*/ +// Assigns a volume to the BQuery object. status_t BQuery::SetVolume(const BVolume* volume) { @@ -345,18 +201,7 @@ BQuery::SetVolume(const BVolume* volume) } -/*! \brief Sets the BQuery's predicate. - A predicate can be set either using this method or constructing one on - the predicate stack. The two methods can not be mixed. The letter one - has precedence over this one. - The method fails, if called after Fetch(). To reuse a BQuery object it has - to be reset via Clear(). - \param predicate the predicate string - \return - - \c B_OK: Everything went fine. - - \c B_NOT_ALLOWED: SetPredicate() was called after Fetch(). - - \c B_NO_MEMORY: Insufficient memory to store the predicate. -*/ +// Assigns the passed-in predicate expression. status_t BQuery::SetPredicate(const char* expression) { @@ -369,16 +214,7 @@ BQuery::SetPredicate(const char* expression) } -/*! \brief Sets the BQuery's target and makes the query live. - The query update messages are sent to the specified target. They might - roll in immediately after calling Fetch(). - This methods fails, if called after Fetch(). To reuse a BQuery object it - has to be reset via Clear(). - \return - - \c B_OK: Everything went fine. - - \c B_BAD_VALUE: \a messenger was not properly initialized. - - \c B_NOT_ALLOWED: SetTarget() was called after Fetch(). -*/ +// Assigns the target messenger and makes the query live. status_t BQuery::SetTarget(BMessenger messenger) { @@ -396,9 +232,7 @@ BQuery::SetTarget(BMessenger messenger) } -/*! \brief Returns whether the query associated with this object is live. - \return \c true, if the query is live, \c false otherwise -*/ +// Gets whether the query associated with this object is live. bool BQuery::IsLive() const { @@ -406,20 +240,7 @@ BQuery::IsLive() const } -/*! \brief Returns the BQuery's predicate. - Regardless of whether the predicate has been constructed using the - predicate stack or set via SetPredicate(), this method returns a - string representation. - \param buffer a pointer to a buffer into which the predicate shall be - written - \param length the size of the provided buffer - \return - - \c B_OK: Everything went fine. - - \c B_NO_INIT: The predicate isn't set. - - \c B_BAD_VALUE: \a buffer is \c NULL or too short. - \note This method causes the predicate stack to be evaluated and cleared. - You can't interleave Push*() and GetPredicate() calls. -*/ +// Fills out buffer with the predicate string assigned to the BQuery object. status_t BQuery::GetPredicate(char* buffer, size_t length) { @@ -436,19 +257,8 @@ BQuery::GetPredicate(char* buffer, size_t length) } -/*! \brief Returns the BQuery's predicate. - Regardless of whether the predicate has been constructed using the - predicate stack or set via SetPredicate(), this method returns a - string representation. - \param predicate a pointer to a BString which shall be set to the - predicate string - \return - - \c B_OK: Everything went fine. - - \c B_NO_INIT: The predicate isn't set. - - \c B_BAD_VALUE: \c NULL \a predicate. - \note This method causes the predicate stack to be evaluated and cleared. - You can't interleave Push*() and GetPredicate() calls. -*/ +// Fills out the passed-in BString object with the predicate string +// assigned to the BQuery object. status_t BQuery::GetPredicate(BString* predicate) { @@ -463,16 +273,7 @@ BQuery::GetPredicate(BString* predicate) } -/*! \brief Returns the length of the BQuery's predicate string. - Regardless of whether the predicate has been constructed using the - predicate stack or set via SetPredicate(), this method returns the length - of its string representation (counting the terminating null). - \return - - the length of the predicate string (counting the terminating null) or - - 0, if an error occured - \note This method causes the predicate stack to be evaluated and cleared. - You can't interleave Push*() and PredicateLength() calls. -*/ +// Gets the length of the predicate string. size_t BQuery::PredicateLength() { @@ -486,10 +287,7 @@ BQuery::PredicateLength() } -/*! \brief Returns the device ID identifying the BQuery's volume. - \return the device ID of the BQuery's volume or \c B_NO_INIT, if the - volume isn't set. -*/ +// Gets the device ID identifying the volume of the BQuery object. dev_t BQuery::TargetDevice() const { @@ -497,18 +295,7 @@ BQuery::TargetDevice() const } -/*! \brief Tells the BQuery to start fetching entries satisfying the predicate. - After Fetch() has been called GetNextEntry(), GetNextRef() and - GetNextDirents() can be used to retrieve the enties. Live query updates - may be sent immediately after this method has been called. - Fetch() fails, if it has already been called. To reuse a BQuery object it - has to be reset via Clear(). - \return - - \c B_OK: Everything went fine. - - \c B_NO_INIT: The predicate or the volume aren't set. - - \c B_BAD_VALUE: The predicate is invalid. - - \c B_NOT_ALLOWED: Fetch() has already been called. -*/ +// Start fetching entries satisfying the predicate. status_t BQuery::Fetch() { @@ -538,20 +325,7 @@ BQuery::Fetch() // #pragma mark - BEntryList interface -/*! \brief Returns the BQuery's next entry as a BEntry. - Places the next entry in the list in \a entry, traversing symlinks if - \a traverse is \c true. - \param entry a pointer to a BEntry to be initialized with the found entry - \param traverse specifies whether to follow it, if the found entry - is a symbolic link. - \note The iterator used by this method is the same one used by - GetNextRef() and GetNextDirents(). - \return - - \c B_OK if successful, - - \c B_ENTRY_NOT_FOUND when at the end of the list, - - \c B_BAD_VALUE: The queries predicate includes unindexed attributes. - - \c B_FILE_ERROR: Fetch() has not been called before. -*/ +// Fills out entry with the next entry traversing symlinks if traverse is true. status_t BQuery::GetNextEntry(BEntry* entry, bool traverse) { @@ -566,18 +340,7 @@ BQuery::GetNextEntry(BEntry* entry, bool traverse) } -/*! \brief Returns the BQuery's next entry as an entry_ref. - Places an entry_ref to the next entry in the list into \a ref. - \param ref a pointer to an entry_ref to be filled in with the data of the - found entry - \note The iterator used by this method is the same one used by - GetNextEntry() and GetNextDirents(). - \return - - \c B_OK if successful, - - \c B_ENTRY_NOT_FOUND when at the end of the list, - - \c B_BAD_VALUE: The queries predicate includes unindexed attributes. - - \c B_FILE_ERROR: Fetch() has not been called before. -*/ +// Fills out ref with the next entry as an entry_ref. status_t BQuery::GetNextRef(entry_ref* ref) { @@ -605,22 +368,8 @@ BQuery::GetNextRef(entry_ref* ref) } -/*! \brief Returns the BQuery's next entries as dirent structures. - Reads a number of entries into the array of dirent structures pointed to by - \a buf. Reads as many but no more than \a count entries, as many entries as - remain, or as many entries as will fit into the array at \a buf with given - length \a length (in bytes), whichever is smallest. - \param buf a pointer to a buffer to be filled with dirent structures of - the found entries - \param length the maximal number of entries to be read. - \note The iterator used by this method is the same one used by - GetNextEntry() and GetNextRef(). - \return - - The number of dirent structures stored in the buffer, 0 when there are - no more entries to be read. - - \c B_BAD_VALUE: The queries predicate includes unindexed attributes. - - \c B_FILE_ERROR: Fetch() has not been called before. -*/ +// Fill out up to count entries into the array of dirent structs pointed +// to by buffer. int32 BQuery::GetNextDirents(struct dirent* buffer, size_t length, int32 count) { @@ -632,14 +381,7 @@ BQuery::GetNextDirents(struct dirent* buffer, size_t length, int32 count) } -/*! \brief Rewinds the entry list back to the first entry. - - Unlike R5 Haiku implements this method for BQuery. - - \return - - \c B_OK on success, - - \c B_FILE_ERROR, if Fetch() has not yet been called. -*/ +// Rewinds the entry list back to the first entry. status_t BQuery::Rewind() { @@ -649,9 +391,7 @@ BQuery::Rewind() } -/*! \brief Unimplemented method of the BEntryList interface. - \return 0. -*/ +// Unimplemented method of the BEntryList interface. int32 BQuery::CountEntries() { @@ -659,10 +399,7 @@ BQuery::CountEntries() } -/*! Returns whether Fetch() has already been called on this object. - \return \c true, if Fetch() has successfully been invoked, \c false - otherwise. -*/ +// Gets whether Fetch() has already been called on this object. bool BQuery::_HasFetched() const { @@ -670,22 +407,7 @@ BQuery::_HasFetched() const } -/*! \brief Pushs a node onto the predicate stack. - If the stack has not been allocate until this time, this method does - allocate it. - If the supplied node is \c NULL, it is assumed that there was not enough - memory to allocate the node and thus \c B_NO_MEMORY is returned. - In case the method fails, the caller retains the ownership of the supplied - node and thus is responsible for deleting it, if \a deleteOnError is - \c false. If it is \c true, the node is deleted, if an error occurs. - \param node the node to be pushed - \param deleteOnError - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: \c NULL \a node or insuffient memory to allocate the - predicate stack or push the node. - - \c B_NOT_ALLOWED: _PushNode() was called after Fetch(). -*/ +// Pushes a node onto the predicate stack. status_t BQuery::_PushNode(QueryNode* node, bool deleteOnError) { @@ -706,13 +428,7 @@ BQuery::_PushNode(QueryNode* node, bool deleteOnError) } -/*! \brief Helper method to set the BQuery's predicate. - It is not checked whether Fetch() has already been invoked. - \param predicate the predicate string - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Insufficient memory to store the predicate. -*/ +// Helper method to set the predicate. status_t BQuery::_SetPredicate(const char* expression) { @@ -732,16 +448,7 @@ BQuery::_SetPredicate(const char* expression) } -/*! Evaluates the query's predicate stack. - The method does nothing (and returns \c B_OK), if the stack is \c NULL. - If the stack is non-null and Fetch() has already been called, the method - fails. - \return - - \c B_OK: Everything went fine. - - \c B_NO_MEMORY: Insufficient memory. - - \c B_NOT_ALLOWED: _EvaluateStack() was called after Fetch(). - - another error code -*/ +// Evaluates the predicate stack. status_t BQuery::_EvaluateStack() { From e0566cc88e73d34d5fe58f66ec7d04bc7017b273 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Sat, 16 Feb 2013 07:46:32 +0100 Subject: [PATCH 14/20] Update translations from Pootle --- .../add-ons/disk_systems/intel/de.catkeys | 4 +-- .../add-ons/disk_systems/intel/hu.catkeys | 4 +-- .../add-ons/disk_systems/intel/sv.catkeys | 4 +-- .../add-ons/disk_systems/ntfs/de.catkeys | 2 ++ .../add-ons/disk_systems/ntfs/hu.catkeys | 2 ++ .../add-ons/disk_systems/ntfs/ja.catkeys | 2 ++ .../add-ons/disk_systems/ntfs/sv.catkeys | 2 ++ .../media-add-ons/multi_audio/de.catkeys | 17 +++++++++ .../media-add-ons/multi_audio/fr.catkeys | 2 +- data/catalogs/apps/aboutsystem/ja.catkeys | 2 +- data/catalogs/apps/drivesetup/de.catkeys | 9 ++++- data/catalogs/apps/drivesetup/hu.catkeys | 9 ++++- data/catalogs/apps/drivesetup/ja.catkeys | 9 ++++- data/catalogs/apps/drivesetup/sv.catkeys | 9 ++++- data/catalogs/apps/expander/ja.catkeys | 2 +- data/catalogs/apps/firstbootprompt/be.catkeys | 3 +- data/catalogs/apps/firstbootprompt/de.catkeys | 4 +-- data/catalogs/apps/firstbootprompt/el.catkeys | 3 +- data/catalogs/apps/firstbootprompt/fi.catkeys | 3 +- data/catalogs/apps/firstbootprompt/fr.catkeys | 9 +++-- data/catalogs/apps/firstbootprompt/hi.catkeys | 5 ++- data/catalogs/apps/firstbootprompt/hu.catkeys | 7 ++-- data/catalogs/apps/firstbootprompt/ja.catkeys | 7 ++-- data/catalogs/apps/firstbootprompt/lt.catkeys | 3 +- data/catalogs/apps/firstbootprompt/nb.catkeys | 2 +- data/catalogs/apps/firstbootprompt/nl.catkeys | 3 +- data/catalogs/apps/firstbootprompt/pl.catkeys | 3 +- .../apps/firstbootprompt/pt_BR.catkeys | 13 ++++--- data/catalogs/apps/firstbootprompt/ro.catkeys | 3 +- data/catalogs/apps/firstbootprompt/ru.catkeys | 3 +- data/catalogs/apps/firstbootprompt/sk.catkeys | 3 +- data/catalogs/apps/firstbootprompt/sv.catkeys | 9 +++-- data/catalogs/apps/firstbootprompt/uk.catkeys | 3 +- .../apps/firstbootprompt/zh_Hans.catkeys | 3 +- data/catalogs/apps/fontdemo/de.catkeys | 3 +- data/catalogs/apps/fontdemo/sv.catkeys | 3 +- data/catalogs/apps/icon-o-matic/ja.catkeys | 8 ++--- data/catalogs/apps/installer/ja.catkeys | 2 +- data/catalogs/apps/launchbox/ja.catkeys | 2 +- data/catalogs/apps/magnify/be.catkeys | 10 +----- data/catalogs/apps/magnify/de.catkeys | 10 +----- data/catalogs/apps/magnify/el.catkeys | 9 +---- data/catalogs/apps/magnify/fi.catkeys | 10 +----- data/catalogs/apps/magnify/fr.catkeys | 10 +----- data/catalogs/apps/magnify/hi.catkeys | 7 +--- data/catalogs/apps/magnify/hu.catkeys | 10 +----- data/catalogs/apps/magnify/ja.catkeys | 10 +----- data/catalogs/apps/magnify/lt.catkeys | 10 +----- data/catalogs/apps/magnify/nl.catkeys | 10 +----- data/catalogs/apps/magnify/pl.catkeys | 10 +----- data/catalogs/apps/magnify/pt_BR.catkeys | 10 +----- data/catalogs/apps/magnify/ro.catkeys | 9 +---- data/catalogs/apps/magnify/ru.catkeys | 10 +----- data/catalogs/apps/magnify/sk.catkeys | 10 +----- data/catalogs/apps/magnify/sv.catkeys | 10 +----- data/catalogs/apps/magnify/uk.catkeys | 9 +---- data/catalogs/apps/magnify/zh_Hans.catkeys | 10 +----- data/catalogs/apps/mediaconverter/ja.catkeys | 6 ++-- data/catalogs/apps/people/ja.catkeys | 2 +- data/catalogs/apps/terminal/be.catkeys | 3 +- data/catalogs/apps/terminal/de.catkeys | 3 +- data/catalogs/apps/terminal/el.catkeys | 3 +- data/catalogs/apps/terminal/fi.catkeys | 3 +- data/catalogs/apps/terminal/fr.catkeys | 3 +- data/catalogs/apps/terminal/hu.catkeys | 3 +- data/catalogs/apps/terminal/ja.catkeys | 3 +- data/catalogs/apps/terminal/lt.catkeys | 3 +- data/catalogs/apps/terminal/nl.catkeys | 3 +- data/catalogs/apps/terminal/pl.catkeys | 3 +- data/catalogs/apps/terminal/pt_BR.catkeys | 3 +- data/catalogs/apps/terminal/ro.catkeys | 3 +- data/catalogs/apps/terminal/ru.catkeys | 3 +- data/catalogs/apps/terminal/sk.catkeys | 3 +- data/catalogs/apps/terminal/sv.catkeys | 3 +- data/catalogs/apps/terminal/uk.catkeys | 3 +- data/catalogs/apps/terminal/zh_Hans.catkeys | 3 +- data/catalogs/apps/webpositive/be.catkeys | 3 +- data/catalogs/apps/webpositive/de.catkeys | 3 +- data/catalogs/apps/webpositive/fi.catkeys | 3 +- data/catalogs/apps/webpositive/fr.catkeys | 3 +- data/catalogs/apps/webpositive/hu.catkeys | 3 +- data/catalogs/apps/webpositive/ja.catkeys | 11 +++--- data/catalogs/apps/webpositive/lt.catkeys | 3 +- data/catalogs/apps/webpositive/nl.catkeys | 3 +- data/catalogs/apps/webpositive/pl.catkeys | 3 +- data/catalogs/apps/webpositive/pt_BR.catkeys | 3 +- data/catalogs/apps/webpositive/ru.catkeys | 3 +- data/catalogs/apps/webpositive/sk.catkeys | 3 +- data/catalogs/apps/webpositive/sv.catkeys | 3 +- .../catalogs/apps/webpositive/zh_Hans.catkeys | 3 +- data/catalogs/kits/ja.catkeys | 2 +- data/catalogs/kits/tracker/be.catkeys | 5 +-- data/catalogs/kits/tracker/de.catkeys | 6 ++-- data/catalogs/kits/tracker/el.catkeys | 3 +- data/catalogs/kits/tracker/fi.catkeys | 5 +-- data/catalogs/kits/tracker/fr.catkeys | 5 +-- data/catalogs/kits/tracker/hi.catkeys | 3 +- data/catalogs/kits/tracker/hu.catkeys | 6 ++-- data/catalogs/kits/tracker/ja.catkeys | 36 +++++++++---------- data/catalogs/kits/tracker/lt.catkeys | 3 +- data/catalogs/kits/tracker/nl.catkeys | 3 +- data/catalogs/kits/tracker/pl.catkeys | 3 +- data/catalogs/kits/tracker/pt_BR.catkeys | 5 +-- data/catalogs/kits/tracker/ro.catkeys | 3 +- data/catalogs/kits/tracker/ru.catkeys | 3 +- data/catalogs/kits/tracker/sk.catkeys | 3 +- data/catalogs/kits/tracker/sv.catkeys | 6 ++-- data/catalogs/kits/tracker/uk.catkeys | 3 +- data/catalogs/kits/tracker/zh_Hans.catkeys | 3 +- data/catalogs/preferences/keymap/ja.catkeys | 2 +- .../preferences/notifications/de.catkeys | 3 +- .../preferences/notifications/hu.catkeys | 3 +- .../preferences/notifications/ja.catkeys | 3 +- .../preferences/notifications/sv.catkeys | 3 +- data/catalogs/preferences/sounds/ja.catkeys | 2 +- data/catalogs/preferences/time/de.catkeys | 6 +++- data/catalogs/preferences/time/hu.catkeys | 6 +++- data/catalogs/preferences/time/ja.catkeys | 6 +++- data/catalogs/preferences/time/sv.catkeys | 6 +++- data/catalogs/servers/notification/ja.catkeys | 2 +- data/catalogs/servers/registrar/ja.catkeys | 2 +- .../tests/servers/app/playground/ja.catkeys | 2 +- 122 files changed, 240 insertions(+), 381 deletions(-) create mode 100644 data/catalogs/add-ons/disk_systems/ntfs/de.catkeys create mode 100644 data/catalogs/add-ons/disk_systems/ntfs/hu.catkeys create mode 100644 data/catalogs/add-ons/disk_systems/ntfs/ja.catkeys create mode 100644 data/catalogs/add-ons/disk_systems/ntfs/sv.catkeys create mode 100644 data/catalogs/add-ons/media/media-add-ons/multi_audio/de.catkeys diff --git a/data/catalogs/add-ons/disk_systems/intel/de.catkeys b/data/catalogs/add-ons/disk_systems/intel/de.catkeys index 44f7993186..45bee0e511 100644 --- a/data/catalogs/add-ons/disk_systems/intel/de.catkeys +++ b/data/catalogs/add-ons/disk_systems/intel/de.catkeys @@ -1,2 +1,2 @@ -1 german x-vnd.Haiku-IntelDiskAddOn 4191422532 -Active partition BFS_Creation_Parameter Aktive Partition +1 german x-vnd.Haiku-IntelDiskAddOn 946918966 +Active partition PrimaryPartitionEditor Aktive Partition diff --git a/data/catalogs/add-ons/disk_systems/intel/hu.catkeys b/data/catalogs/add-ons/disk_systems/intel/hu.catkeys index 03cac3bf4a..796712c4e2 100644 --- a/data/catalogs/add-ons/disk_systems/intel/hu.catkeys +++ b/data/catalogs/add-ons/disk_systems/intel/hu.catkeys @@ -1,2 +1,2 @@ -1 hungarian x-vnd.Haiku-IntelDiskAddOn 4191422532 -Active partition BFS_Creation_Parameter Aktív partíció +1 hungarian x-vnd.Haiku-IntelDiskAddOn 946918966 +Active partition PrimaryPartitionEditor Aktív partíció diff --git a/data/catalogs/add-ons/disk_systems/intel/sv.catkeys b/data/catalogs/add-ons/disk_systems/intel/sv.catkeys index 7c87b82746..d28a812360 100644 --- a/data/catalogs/add-ons/disk_systems/intel/sv.catkeys +++ b/data/catalogs/add-ons/disk_systems/intel/sv.catkeys @@ -1,2 +1,2 @@ -1 swedish x-vnd.Haiku-IntelDiskAddOn 4191422532 -Active partition BFS_Creation_Parameter Aktiv partition +1 swedish x-vnd.Haiku-IntelDiskAddOn 946918966 +Active partition PrimaryPartitionEditor Aktiv partition diff --git a/data/catalogs/add-ons/disk_systems/ntfs/de.catkeys b/data/catalogs/add-ons/disk_systems/ntfs/de.catkeys new file mode 100644 index 0000000000..f60a1615c4 --- /dev/null +++ b/data/catalogs/add-ons/disk_systems/ntfs/de.catkeys @@ -0,0 +1,2 @@ +1 german x-vnd.Haiku-NTFSDiskAddOn 25755486 +Name: NTFS_Initialize_Parameter Name: diff --git a/data/catalogs/add-ons/disk_systems/ntfs/hu.catkeys b/data/catalogs/add-ons/disk_systems/ntfs/hu.catkeys new file mode 100644 index 0000000000..7c3c1fe702 --- /dev/null +++ b/data/catalogs/add-ons/disk_systems/ntfs/hu.catkeys @@ -0,0 +1,2 @@ +1 hungarian x-vnd.Haiku-NTFSDiskAddOn 25755486 +Name: NTFS_Initialize_Parameter Név: diff --git a/data/catalogs/add-ons/disk_systems/ntfs/ja.catkeys b/data/catalogs/add-ons/disk_systems/ntfs/ja.catkeys new file mode 100644 index 0000000000..09f5ac428f --- /dev/null +++ b/data/catalogs/add-ons/disk_systems/ntfs/ja.catkeys @@ -0,0 +1,2 @@ +1 japanese x-vnd.Haiku-NTFSDiskAddOn 25755486 +Name: NTFS_Initialize_Parameter 名前: diff --git a/data/catalogs/add-ons/disk_systems/ntfs/sv.catkeys b/data/catalogs/add-ons/disk_systems/ntfs/sv.catkeys new file mode 100644 index 0000000000..a6d3a81c34 --- /dev/null +++ b/data/catalogs/add-ons/disk_systems/ntfs/sv.catkeys @@ -0,0 +1,2 @@ +1 swedish x-vnd.Haiku-NTFSDiskAddOn 25755486 +Name: NTFS_Initialize_Parameter Namn: diff --git a/data/catalogs/add-ons/media/media-add-ons/multi_audio/de.catkeys b/data/catalogs/add-ons/media/media-add-ons/multi_audio/de.catkeys new file mode 100644 index 0000000000..363c4c1643 --- /dev/null +++ b/data/catalogs/add-ons/media/media-add-ons/multi_audio/de.catkeys @@ -0,0 +1,17 @@ +1 german x-vnd.Haiku-hmulti_audio.media_addon 1381568870 +SPDIF MultiAudio SPDIF +Extended Setup MultiAudio Erweiterte Einstellungen +CD MultiAudio CD +Phone MultiAudio Telefon +Aux MultiAudio Aux +Headphones MultiAudio Kopfhörer +Input MultiAudio Eingang +General MultiAudio Allgemein +Enhanced Setup MultiAudio Erweiterte Einstellungen +Volume MultiAudio Lautstärke +Output MultiAudio Ausgang +Video MultiAudio Video + frequency: MultiAudio Frequenz: +Enable MultiAudio Aktivieren +Mute MultiAudio Stumm +Setup MultiAudio Einstellungen diff --git a/data/catalogs/add-ons/media/media-add-ons/multi_audio/fr.catkeys b/data/catalogs/add-ons/media/media-add-ons/multi_audio/fr.catkeys index ae215fca73..f6d04cc00f 100644 --- a/data/catalogs/add-ons/media/media-add-ons/multi_audio/fr.catkeys +++ b/data/catalogs/add-ons/media/media-add-ons/multi_audio/fr.catkeys @@ -5,7 +5,7 @@ Gain MultiAudio Gain Extended Setup MultiAudio Réglages étendus CD MultiAudio CD Tone control MultiAudio Tonalité -Phone MultiAudio Enceintes +Phone MultiAudio Téléphone Aux MultiAudio Auxiliaire Output bass MultiAudio Graves Headphones MultiAudio Casque diff --git a/data/catalogs/apps/aboutsystem/ja.catkeys b/data/catalogs/apps/aboutsystem/ja.catkeys index 9f4e4f5d6a..687f58f70c 100644 --- a/data/catalogs/apps/aboutsystem/ja.catkeys +++ b/data/catalogs/apps/aboutsystem/ja.catkeys @@ -76,7 +76,7 @@ Copyright © 2003-2006 Intel Corporation. All rights reserved. AboutView Copyri Copyright © 1997-2006 PDFlib GmbH and Thomas Merz. All rights reserved.\nPDFlib and PDFlib logo are registered trademarks of PDFlib GmbH. AboutView Copyright © 1997-2006 PDFlib GmbHおよびThomas Merz. All rights reserved.\nPDFlibおよびPDFlibロゴはPDFlib GmbHの登録商標です. Copyright © 1991-2000 Silicon Graphics, Inc. All rights reserved. AboutView Copyright © 1991-2000 Silicon Graphics, Inc. All rights reserved. Contains software from the GNU Project, released under the GPL and LGPL licenses:\nGNU C Library, GNU coretools, diffutils, findutils, sharutils, gawk, bison, m4, make, gdb, wget, ncurses, termcap, Bourne Again Shell.\nCopyright © The Free Software Foundation. AboutView 次のソフトウェアはGNU Projectによるものであり、GPLおよびLGPLライセンスの下で公開されています:\nGNU C Library, GNU coretools, diffutils, findutils, sharutils, gawk, bison, m4, make, gdb, wget, ncurses, termcap, Bourne Again Shell.\nCopyright © The Free Software Foundation. -…and the many people making donations!\n\n AboutView ...寄付をしていただいた大勢の方々!\n\n +…and the many people making donations!\n\n AboutView …寄付をしていただいた大勢の方々!\n\n MIT license. All rights reserved. AboutView MITライセンス. All rights reserved. [Click a license name to read the respective license.]\n\n AboutView 「各ライセンスを表示するには、ライセンス名をクリックしてください。」\n\n Copyright © 2007 Ralink Technology Corporation. All rights reserved. AboutView Copyright © 2007 Ralink Technology Corporation. All rights reserved. diff --git a/data/catalogs/apps/drivesetup/de.catkeys b/data/catalogs/apps/drivesetup/de.catkeys index e7b5aa485e..ea0011408d 100644 --- a/data/catalogs/apps/drivesetup/de.catkeys +++ b/data/catalogs/apps/drivesetup/de.catkeys @@ -1,11 +1,14 @@ -1 german x-vnd.Haiku-DriveSetup 659039073 +1 german x-vnd.Haiku-DriveSetup 2311878791 DriveSetup System name Datenträgerverwaltung +Cancel AbstractParametersPanel Abbrechen Delete MainWindow Löschen Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so! MainWindow Soll die Änderungen jetzt auf den Datenträger geschrieben werden?\n\nAlle Daten auf der gewählten Partition gehen dabei unwiderruflich verloren! Rescan MainWindow Aktualisieren OK MainWindow OK Could not aquire partitioning information. MainWindow Partitionierungsinformationen konnten nicht ermittelt werden. There's no space on the partition where a child partition could be created. MainWindow Es gibt keinen Platz auf der Partition, in der eine Tochterpartition angelegt werden könnte. +Initialize InitializeParametersPanel Initialisieren +OK AbstractParametersPanel OK PartitionList Unable to find the selected partition by ID. MainWindow Die ausgewählte Partition konnte anhand ihrer ID nicht gefunden werden. Select a partition from the list below. DiskView Bitte eine Partition aus der unten stehenden Liste wählen. @@ -46,22 +49,26 @@ Are you sure you want to format a raw disk? (most people initialize the disk wit Device PartitionList Gerät Disk MainWindow Datenträger Are you sure you want to initialize the selected disk? All data will be lost. You will be asked again before changes are written to the disk.\n MainWindow Soll der ausgewählte Datenträger wirklich formatiert werden? Alle Daten werden verloren gehen. Die Änderungen werden erst nach einer weiteren Bestätigung geschrieben.\n +Partition size CreateParametersPanel Partitionsgröße Device DiskView Gerät Active PartitionList Aktiv Volume name PartitionList Datenträgername Continue MainWindow Weiter Cannot delete the selected partition. MainWindow Gewählte Partition konnte nicht gelöscht werden. Mount all MainWindow Alle einhängen +End: %s Support Ende: %s Cancel MainWindow Abbrechen Delete partition MainWindow Partition löschen Eject MainWindow Auswerfen Partition MainWindow Partition +Create CreateParametersPanel Anlegen File system PartitionList Dateisystem Validation of the given creation parameters failed. MainWindow Die Überprüfung der zum Anlegen angegebenen Parameter ist fehlgeschlagen. Size PartitionList Größe Wipe (not implemented) MainWindow Löschen (nicht implementiert) Validation of the given initialization parameters failed. MainWindow Die Überprüfung der zum Initialisieren angegebenen Parameter ist fehlgeschlagen. The selected partition does not contain a partitioning system. MainWindow Die ausgewählte Partition enthält kein Partitionierungssystem. +Offset: %s Support Versatz: %s Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so! MainWindow Sollen die Änderungen wirklich auf den Datenträger geschrieben werden?\n\nAlle Daten auf der Partition \"%s\" gehen dabei unwiderruflich verloren! The partition %s is currently mounted. MainWindow Die Partition \"%s\" ist momentan eingehangen. Surface test (not implemented) MainWindow Oberflächentest (nicht implementiert) diff --git a/data/catalogs/apps/drivesetup/hu.catkeys b/data/catalogs/apps/drivesetup/hu.catkeys index 6ee71eb0c8..e5ed506ba3 100644 --- a/data/catalogs/apps/drivesetup/hu.catkeys +++ b/data/catalogs/apps/drivesetup/hu.catkeys @@ -1,11 +1,14 @@ -1 hungarian x-vnd.Haiku-DriveSetup 659039073 +1 hungarian x-vnd.Haiku-DriveSetup 2311878791 DriveSetup System name Lemezkezelő +Cancel AbstractParametersPanel Mégse Delete MainWindow Törlés Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so! MainWindow Biztosan jóváhagyja az adatok felírását a lemezre?\n\nEz esetben a partíció teljes tartalma visszavonhatatlanul meg fog semmisülni. Rescan MainWindow Frissítés OK MainWindow Rendben Could not aquire partitioning information. MainWindow A partíciók állapotát nem lehetett lekérdezni. There's no space on the partition where a child partition could be created. MainWindow Nincs hely már a partíción, ahol alpartíciót kellene létrehozni. +Initialize InitializeParametersPanel Előkészítés +OK AbstractParametersPanel Rendben PartitionList <üres> Unable to find the selected partition by ID. MainWindow Nincs ilyen azonosítójú partíció. Select a partition from the list below. DiskView Válasszon partíciót a lenti listából! @@ -46,22 +49,26 @@ Are you sure you want to format a raw disk? (most people initialize the disk wit Device PartitionList Eszköz Disk MainWindow Lemez Are you sure you want to initialize the selected disk? All data will be lost. You will be asked again before changes are written to the disk.\n MainWindow Biztosan elő szeretné készíteni a megadott lemezt? Az összes adat el fog veszni. Ezt majd mégegyszer meg kell erősítenie. +Partition size CreateParametersPanel A partíció mérete Device DiskView Eszköz Active PartitionList Aktív Volume name PartitionList Lemez neve Continue MainWindow Folytatás Cannot delete the selected partition. MainWindow A kijelölt partíció nem törölhető. Mount all MainWindow Összes csatolása +End: %s Support Vége: %s Cancel MainWindow Mégse Delete partition MainWindow Partíció törlése Eject MainWindow Kiadás Partition MainWindow Partíció +Create CreateParametersPanel Létrehoz File system PartitionList Fájlrendszer Validation of the given creation parameters failed. MainWindow A létrehozáshoz megadott paramétereket nem sikerült érvényesíteni. Size PartitionList Méret Wipe (not implemented) MainWindow Formázás (még nem működik) Validation of the given initialization parameters failed. MainWindow Az előkészítéshez megadott paramétereket nem sikerült érvényesíteni. The selected partition does not contain a partitioning system. MainWindow A kiválasztott partíción nincs particionálási séma. +Offset: %s Support Kezdete: %s Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so! MainWindow Biztosan a lemezre szeretné írni a kijelölt változtatásokat?\n\nEz esetben a(z) „%s” partíció teljes tartalma visszavonhatatlanul meg fog semmisülni. The partition %s is currently mounted. MainWindow A partíció (%s) csatolva van. Surface test (not implemented) MainWindow Felületellenőrzés (még nem működik) diff --git a/data/catalogs/apps/drivesetup/ja.catkeys b/data/catalogs/apps/drivesetup/ja.catkeys index bf4fbeca5a..38a9161486 100644 --- a/data/catalogs/apps/drivesetup/ja.catkeys +++ b/data/catalogs/apps/drivesetup/ja.catkeys @@ -1,11 +1,14 @@ -1 japanese x-vnd.Haiku-DriveSetup 659039073 +1 japanese x-vnd.Haiku-DriveSetup 2311878791 DriveSetup System name DriveSetup +Cancel AbstractParametersPanel 中止 Delete MainWindow 削除 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so! MainWindow 変更を本当にディスクに保存しますか？\n\nその場合、選択されたパーティションのすべてのデータが失われますので、ご注意ください。 Rescan MainWindow ディスクを再検出 OK MainWindow OK Could not aquire partitioning information. MainWindow パーティション情報の取得に失敗しました。 There's no space on the partition where a child partition could be created. MainWindow 子パーティションを作成するスペースがありません。 +Initialize InitializeParametersPanel 初期化 +OK AbstractParametersPanel OK PartitionList <空> Unable to find the selected partition by ID. MainWindow 選択されたパーティションを ID で検出できませんでした。 Select a partition from the list below. DiskView 下記の一覧からパーティションを一つ選択してください。 @@ -46,22 +49,26 @@ Are you sure you want to format a raw disk? (most people initialize the disk wit Device PartitionList デバイス Disk MainWindow ディスク Are you sure you want to initialize the selected disk? All data will be lost. You will be asked again before changes are written to the disk.\n MainWindow 本当に選択したディスクを初期化しますか? データはすべて失われます。変更をディスクに書き込む直前に再度確認します。\n +Partition size CreateParametersPanel パーティションサイズ Device DiskView デバイス Active PartitionList アクティブ Volume name PartitionList ボリューム名 Continue MainWindow 続ける Cannot delete the selected partition. MainWindow 選択されたパーティションを削除できません。 Mount all MainWindow すべてマウント +End: %s Support 終了位置: %s Cancel MainWindow 中止 Delete partition MainWindow パーティションを削除 Eject MainWindow 取り出す Partition MainWindow パーティション +Create CreateParametersPanel 新規作成 File system PartitionList ファイルシステム Validation of the given creation parameters failed. MainWindow 作成パラメーターの検証に失敗しました。 Size PartitionList サイズ Wipe (not implemented) MainWindow ワイプ (実装されていません) Validation of the given initialization parameters failed. MainWindow 初期化パラメーターの検証に失敗しました The selected partition does not contain a partitioning system. MainWindow 選択されたパーティションにパーティションシステムはありません。 +Offset: %s Support オフセット: %s Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so! MainWindow 変更をすぐにディスクに保存しますか？\n\nその場合、ディスク %s のデータがすべて失われますので、ご注意ください。 The partition %s is currently mounted. MainWindow %s パーティションが現在マウントされています。 Surface test (not implemented) MainWindow 表面チェック (実装されていません) diff --git a/data/catalogs/apps/drivesetup/sv.catkeys b/data/catalogs/apps/drivesetup/sv.catkeys index f8c96ead88..64a6a03d88 100644 --- a/data/catalogs/apps/drivesetup/sv.catkeys +++ b/data/catalogs/apps/drivesetup/sv.catkeys @@ -1,11 +1,14 @@ -1 swedish x-vnd.Haiku-DriveSetup 659039073 +1 swedish x-vnd.Haiku-DriveSetup 2311878791 DriveSetup System name DiskHanterare +Cancel AbstractParametersPanel Avbryt Delete MainWindow Ta bort Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so! MainWindow Är du säker på att du vill skriva ändringar tillbaka till disken ny?\n\nAlla data på den valda partitionen kommer att raderas om du gör så! Rescan MainWindow Uppdatera OK MainWindow OK Could not aquire partitioning information. MainWindow Kunde inte läsa partitionsinformation. There's no space on the partition where a child partition could be created. MainWindow Det finns inget utrymme för en underpartition på partitionen. +Initialize InitializeParametersPanel Initiera +OK AbstractParametersPanel OK PartitionList Unable to find the selected partition by ID. MainWindow Kunde inte hitta den valda partitionen via ID. Select a partition from the list below. DiskView Välj en partition från listan nedan. @@ -46,22 +49,26 @@ Are you sure you want to format a raw disk? (most people initialize the disk wit Device PartitionList Enhet Disk MainWindow Disk Are you sure you want to initialize the selected disk? All data will be lost. You will be asked again before changes are written to the disk.\n MainWindow Är du säker att du vill initiera den valda disken? All data kommer att förloras. Du kommet att få frågan igen innan ändringarna skrivs till disk.\n +Partition size CreateParametersPanel Partitionsstorlek Device DiskView Enhet Active PartitionList Aktiv Volume name PartitionList Volymnamn Continue MainWindow Fortsätt Cannot delete the selected partition. MainWindow Kan inte radera den valda partitionen. Mount all MainWindow Montera alla +End: %s Support Slutar: %s Cancel MainWindow Avbryt Delete partition MainWindow Radera partition Eject MainWindow Mata ut Partition MainWindow Partition +Create CreateParametersPanel Skapa File system PartitionList Filsystem Validation of the given creation parameters failed. MainWindow Utvärdering av den givna parametern misslyckades. Size PartitionList Storlek Wipe (not implemented) MainWindow Formatera (inte implementerat) Validation of the given initialization parameters failed. MainWindow Utvärdering av de givna initialiseringsparametrarna misslyckades. The selected partition does not contain a partitioning system. MainWindow Den valda partitionen innehåller inget partitionssystem. +Offset: %s Support Avstånd: %s Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so! MainWindow Är du säker på att du vill skriva ändringarna till disken?\n\nAll data på partitionen %s kommer att gå förlorad! The partition %s is currently mounted. MainWindow Partitionen %s är monterad. Surface test (not implemented) MainWindow Yttest (inte implementerat) diff --git a/data/catalogs/apps/expander/ja.catkeys b/data/catalogs/apps/expander/ja.catkeys index baaf35ca9c..09c9accecf 100644 --- a/data/catalogs/apps/expander/ja.catkeys +++ b/data/catalogs/apps/expander/ja.catkeys @@ -18,7 +18,7 @@ Creating listing for '%s' ExpanderWindow '%s' のリストを作成中 Continue ExpanderWindow 続ける Destination folder ExpanderPreferences 解凍先フォルダー Other ExpanderPreferences その他 -Cancel ExpanderPreferences キャンセル +Cancel ExpanderPreferences 中止 Expansion ExpanderPreferences 解凍 Are you sure you want to stop expanding this\narchive? The expanded items may not be complete. ExpanderWindow 書庫ファイルの解凍はまだ完了していません。それでも中止しますか？ Select DirectoryFilePanel 選択 diff --git a/data/catalogs/apps/firstbootprompt/be.catkeys b/data/catalogs/apps/firstbootprompt/be.catkeys index 626dfdc14c..63abce77e1 100644 --- a/data/catalogs/apps/firstbootprompt/be.catkeys +++ b/data/catalogs/apps/firstbootprompt/be.catkeys @@ -1,7 +1,6 @@ -1 belarusian x-vnd.Haiku-FirstBootPrompt 2544294242 +1 belarusian x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Карыстальніка Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Мы дзякуем вас за спробу усталяваць Haiku. Спадзяемся, што вам спадабаецца!\n\nВы можаце абраць пажаданую мову інтэрфейса і раскладку клавіятуры ў левым спісе. Гэтыя параметры таксма могуць быць змененыя пазней.\n\nЖадаеце запусціць Усталёўшчык ці загрузіць Дэсктоп?\n -Desktop (Live-CD) BootPromptWindow Дэсктоп (Live-CD) Language BootPromptWindow Мова Welcome to Haiku! BootPromptWindow Вітаем! Run Installer BootPromptWindow Запусціць Усталёўшчык diff --git a/data/catalogs/apps/firstbootprompt/de.catkeys b/data/catalogs/apps/firstbootprompt/de.catkeys index 7a72ee417b..ef9bae4cdc 100644 --- a/data/catalogs/apps/firstbootprompt/de.catkeys +++ b/data/catalogs/apps/firstbootprompt/de.catkeys @@ -1,7 +1,7 @@ -1 german x-vnd.Haiku-FirstBootPrompt 2544294242 +1 german x-vnd.Haiku-FirstBootPrompt 2649051796 Custom BootPromptWindow Benutzerdefiniert +Boot to Desktop BootPromptWindow Desktop starten Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Danke für das Interesse an Haiku!\n\nAus der nebenstehenden Liste können Sprache und Tastaturlayout gewählt werden. Die Einstellungen werden sofort verwendet, lassen sich aber jederzeit im laufenden System ändern.\n\nSoll die Installation gestartet werden oder soll weiter zum Desktop gebootet werden?\n\nDie Übersetzung der Haiku-Anwendungen und anderer Komponenten ist noch nicht abgeschlossen. Wer auf nicht übersetzte Texte stößt und bei der Arbeit helfen möchte, findet dazu weitere Informationen auf der Webseite . -Desktop (Live-CD) BootPromptWindow Desktop (Live-CD) Language BootPromptWindow Sprache Welcome to Haiku! BootPromptWindow Willkommen bei Haiku! Run Installer BootPromptWindow Installer starten diff --git a/data/catalogs/apps/firstbootprompt/el.catkeys b/data/catalogs/apps/firstbootprompt/el.catkeys index 314dee8c4d..e8780691f2 100644 --- a/data/catalogs/apps/firstbootprompt/el.catkeys +++ b/data/catalogs/apps/firstbootprompt/el.catkeys @@ -1,7 +1,6 @@ -1 greek, modern (1453-) x-vnd.Haiku-FirstBootPrompt 2544294242 +1 greek, modern (1453-) x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Προσαρμοσμένο Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Ευχαριστούμε που δοκιμάζετε το Haiku! Ευχόμαστε να σας αρέσει!\n\nΜπορείτε να επιλέξετε τον επιθυμιτή γλώσσα σας και τη διάταξη πληκτρολογίου από τη λίστα στα αριστερά που θα χρησιμοποιείται έπειτα στιγμιαία. Μπορείτε εύκολα να αλλάξετε και τις ρυθμίσεις για την επιφάνεια εργασίας.\n\nΘέλετε να εκτελέσετε τον Εγκαταστάση ή να συνεχίσετε την εκκίνηση στην επιφάνεια εργασίας;\nΣημείωση: Για τις υπόλοιπες γλώσσες, πρoστίθεται μια ενημέρωση:\"Σημείωση: Η μετάφραση των εφαρμογών του Haiku και άλλων περιεχομένων χρειάζεται ακόμη προσπάθεια.. Θα βρείτε συχνά τμήματα χωρίς μετάφραση, αλλά εαν θέλετε μπορείτε να συνεισφέρετε σε αυτή τη δουλεία στο .\" -Desktop (Live-CD) BootPromptWindow Επιφάνεια εργασίας (Live-CD) Language BootPromptWindow Γλώσσα Welcome to Haiku! BootPromptWindow Καλώς ήλθατε στο Haiku! Run Installer BootPromptWindow Έναρξη Εγκατάστασης diff --git a/data/catalogs/apps/firstbootprompt/fi.catkeys b/data/catalogs/apps/firstbootprompt/fi.catkeys index a505542fd5..ab081ab1dc 100644 --- a/data/catalogs/apps/firstbootprompt/fi.catkeys +++ b/data/catalogs/apps/firstbootprompt/fi.catkeys @@ -1,7 +1,6 @@ -1 finnish x-vnd.Haiku-FirstBootPrompt 2544294242 +1 finnish x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Oma Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Kiitoksia siitä, että kokeilet Haikua! Toivomme, että pidät siitä!\n\nVoit valita ensisijaisen kielen ja näppäimistöasetuksen vasemmalla näkyvästä luettelosta. Asetukset otetaan käyttöön välittömästi. Voit helposti vaihtaa molempia asetuksia myöhemmin työpöydältäsi.\n\nHaluatko suorittaa asennusohjelman tai jatkaa alkulautausta työpöydälle?\n Huomaa: Ponnistelemme edelleen Haiku-sovellusten ja muiden komponenttien kotoistamiseksi. Kohtaat usein suomentamattomia merkkijonoja, mutta jos haluat, voit liittyä työhön osoitteessa . -Desktop (Live-CD) BootPromptWindow Työpöytä (Live-CD) Language BootPromptWindow Kieli Welcome to Haiku! BootPromptWindow Tervetuloa Haikuun! Run Installer BootPromptWindow Suorita asennusohjelma diff --git a/data/catalogs/apps/firstbootprompt/fr.catkeys b/data/catalogs/apps/firstbootprompt/fr.catkeys index f4eb0f0738..ca0903961b 100644 --- a/data/catalogs/apps/firstbootprompt/fr.catkeys +++ b/data/catalogs/apps/firstbootprompt/fr.catkeys @@ -1,8 +1,7 @@ -1 french x-vnd.Haiku-FirstBootPrompt 2649051796 +1 french x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Personnalisé -Boot to Desktop BootPromptWindow Démarrer le bureau -Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Merci d'essayer Haiku ! Nous espérons qu'il vous plaira !\n\nVous pouvez sélectionner votre langue préférée et la disposition du clavier dans la liste sur la gauche. Elle sera utilisée immédiatement. Plus tard, vous pourrez modifier facilement et à la volée ces deux paramètres à partir du bureau.\n\nNotez que la traduction des applications d'Haiku et de ses divers composants fait l'objet d'un effort continu. Vous rencontrerez souvent du texte pas encore traduit, mais si vous le souhaitez, vous pouvez participer à ce travail en nous rejoignant sur .\n\nSouhaitez-vous procéder à l'installation ou continuer le démarrage du bureau ?\n +Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Merci d'essayer Haiku ! Nous espérons que vous l'aimerez !\n\nVeuillez choisir votre clavier et votre langue préférés dans la liste à gauche. Ils seront pris en compte instantanément. Plus tard, vous pourrez facilement modifier à la volée ces deux réglages à partir du bureau.\n\nVoulez-vous exécuter le programme d'installation ou continuer le démarrage du bureau ?\n\nNote : La traduction des applications et des autres parties d'Haiku n'est pas terminée. Vous trouverez souvent des phrases non traduites, mais si vous le souhaitez, vous pouvez apporter votre contribution sur .\n Language BootPromptWindow Langue -Welcome to Haiku! BootPromptWindow Bienvenue dans Haiku ! -Run Installer BootPromptWindow Procéder à l'installation +Welcome to Haiku! BootPromptWindow Bienvenue dans Haiku ! +Run Installer BootPromptWindow Lancer l'installeur Keymap BootPromptWindow Disposition du clavier diff --git a/data/catalogs/apps/firstbootprompt/hi.catkeys b/data/catalogs/apps/firstbootprompt/hi.catkeys index 1534a21a4e..b00bc0ad3a 100644 --- a/data/catalogs/apps/firstbootprompt/hi.catkeys +++ b/data/catalogs/apps/firstbootprompt/hi.catkeys @@ -1,7 +1,6 @@ -1 hindi x-vnd.Haiku-FirstBootPrompt 2544294242 -Custom BootPromptWindow कस्टम +1 hindi x-vnd.Haiku-FirstBootPrompt 988630706 +Custom BootPromptWindow कस्टम Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" धन्यवाद हाइकु को इस्तमाल करने के लिए! हम आशा करते हैं की आप को यह पसंद आया होगा!\n\nआप अपने मनपसंद भाषा और कीबोर्ड लेयाओउट चुन सकते है लिस्ट में से. आप बाद में दोंनो चीज़ बदल सकते है डेस्कटॉप पर से.\n\nक्या आप इंस्टॉलर रन करना चाहेंगे या फिर डेस्कटॉप को बूट करना जारी रखना चाहेंगे?\n -Desktop (Live-CD) BootPromptWindow डेस्कटॉप (लाइव सीडी) Language BootPromptWindow भाषा Welcome to Haiku! BootPromptWindow हाइकू में आपका स्वागत है! Run Installer BootPromptWindow इंस्टॉलर चलाएँ diff --git a/data/catalogs/apps/firstbootprompt/hu.catkeys b/data/catalogs/apps/firstbootprompt/hu.catkeys index acfb3f2a4c..15bae403a3 100644 --- a/data/catalogs/apps/firstbootprompt/hu.catkeys +++ b/data/catalogs/apps/firstbootprompt/hu.catkeys @@ -1,8 +1,7 @@ -1 hungarian x-vnd.Haiku-FirstBootPrompt 2649051796 +1 hungarian x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Egyéni -Boot to Desktop BootPromptWindow Az Asztalt -Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Köszönjük, hogy kipróbálja a Haiku-t, reméljük, meg lesz vele elégedve!\n\nA bal oldali listából kiválasztva a nyelvet a felület nyelve és a billentyűzetkiosztás automatikusan beállításra kerül. A későbbiekben ez bármikor módosítható a beállításoknál.\n\nMegjegyzés: a Haiku-t önkéntesek fordítják, így megeshet, hogy valami angolul jelenik meg. Ha Ön is részt szeretne venni a fordításban, akkor csatlakozhat a fordítókhoz a oldalon.\n\nA Telepítőt, vagy inkább az Asztalt indítsuk most el?\n +Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Köszönjük, hogy kipróbálja a Haiku-t!\n\nA baloldali listából választhat nyelvet és billentyűzetkiosztást. Mindkét beállítást könnyen átállíthatja majd később az Asztalról.\n\nA Telepítőt vagy az Asztalt indítsuk most el?\n\nMegjegyzés: A Haiku programjait önkéntesek fordítják, folyamatosan. Könnyen megeshet hogy hiányosan, vagy hibásan fordított programokkal fog találkozni. Ha szeretné, csatlakozhat a munkához és kijavíthatja ezeket a oldalon. Köszönjük! Language BootPromptWindow Nyelv Welcome to Haiku! BootPromptWindow A Haiku üdvözli Önt! -Run Installer BootPromptWindow A Telepítőt +Run Installer BootPromptWindow Telepítő Keymap BootPromptWindow Billentyűzetkiosztás diff --git a/data/catalogs/apps/firstbootprompt/ja.catkeys b/data/catalogs/apps/firstbootprompt/ja.catkeys index bc4b0778cb..42e37bbaee 100644 --- a/data/catalogs/apps/firstbootprompt/ja.catkeys +++ b/data/catalogs/apps/firstbootprompt/ja.catkeys @@ -1,8 +1,7 @@ -1 japanese x-vnd.Haiku-FirstBootPrompt 2649051796 +1 japanese x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow カスタム -Boot to Desktop BootPromptWindow デスクトップを起動 -Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Haikuを試用していただきありがとうございます。Haikuのことを気に入っていただければ幸いです。\n\n左のリストからご希望の言語とキーマップの選択がすぐできます。あとで、デスクトップからこれらの設定をすぐに簡単に変更できます。\n\nインストーラーを実行しますか、それともデスクトップの起動を続行しますか?\n +Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Haikuを試用していただきありがとうございます。Haikuのことを気に入っていただければ幸いです。\n\n左欄からご希望の言語とキーマップの選択がすぐできます。あとで、デスクトップからこれらの設定をすぐに簡単に変更できます。\n\nインストーラーを実行しますか、それともライブCDモードでデスクトップを起動しますか？\n\n注釈：Haikuアプリケーションや他のコンポーネントのロケール化は進行中のため、翻訳されていない部分が表示されることや翻訳がおかしいことがあります。Haikuの翻訳に協力したい方は、haiku-i18n-jp MLにてご連絡ください（http://freelists.org/list/haiku-i18n-jp）。\n Language BootPromptWindow 言語 -Welcome to Haiku! BootPromptWindow Haikuへようこそ! +Welcome to Haiku! BootPromptWindow Haiku へようこそ！ Run Installer BootPromptWindow インストーラーを実行 Keymap BootPromptWindow キーマップ diff --git a/data/catalogs/apps/firstbootprompt/lt.catkeys b/data/catalogs/apps/firstbootprompt/lt.catkeys index 5a8c21c142..db571db9ae 100644 --- a/data/catalogs/apps/firstbootprompt/lt.catkeys +++ b/data/catalogs/apps/firstbootprompt/lt.catkeys @@ -1,7 +1,6 @@ -1 lithuanian x-vnd.Haiku-FirstBootPrompt 2544294242 +1 lithuanian x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Pasirinktinė Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Dėkojame, kad nusprendėte išbandyti „Haiku“! Mes tikimės, kad ši operacinė sistema Jums patiks!\n\nIš sąrašo kairėje galite išsirinkti norimą kalbą ir klaviatūros išdėstymą – šių nuostatų pakeitimai bus iškart pritaikyti. Taip pat lengvai jas galėsite pasikeisti ir vėliau, jau naudodamiesi sistema.\n\nAr norite paleisti įdiegimo programą, ar išbandyti „Haiku“ aplinką, ją paleidžiant tiesiai iš šios laikmenos? -Desktop (Live-CD) BootPromptWindow Išbandyti „Haiku“ Language BootPromptWindow Kalba Welcome to Haiku! BootPromptWindow Sveiki, čia – „Haiku“! Run Installer BootPromptWindow Paleisti įdiegimo programą diff --git a/data/catalogs/apps/firstbootprompt/nb.catkeys b/data/catalogs/apps/firstbootprompt/nb.catkeys index 1a720c09e7..72745e63cd 100644 --- a/data/catalogs/apps/firstbootprompt/nb.catkeys +++ b/data/catalogs/apps/firstbootprompt/nb.catkeys @@ -1,4 +1,4 @@ -1 bokmål, norwegian; norwegian bokmål x-vnd.Haiku-FirstBootPrompt 2544294242 +1 bokmål, norwegian; norwegian bokmål x-vnd.Haiku-ReadOnlyBootPrompt 2544294242 Custom BootPromptWindow Tilpasset Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Takk for at du prøver ut Haiku! Vi håper du vil like det!\n\nDu kan velge hvilket språk du foretrekker og tastaturoppsett fra sliten til venstre, som så vil bli tatt i bruk umiddelbart. Du kan enkelt endre begge innstillingne fra skrivebordet senere.\n\nØnsker du å kjøre installasjonsprogrammet, eller fortsette oppstartsprosessen fra CD-en?\n Desktop (Live-CD) BootPromptWindow Skrivebord (Live-CD) diff --git a/data/catalogs/apps/firstbootprompt/nl.catkeys b/data/catalogs/apps/firstbootprompt/nl.catkeys index 9a9e6e4e1a..88f6a47ba5 100644 --- a/data/catalogs/apps/firstbootprompt/nl.catkeys +++ b/data/catalogs/apps/firstbootprompt/nl.catkeys @@ -1,7 +1,6 @@ -1 dutch; flemish x-vnd.Haiku-FirstBootPrompt 2544294242 +1 dutch; flemish x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Aangepast Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Bedankt om Haiku uit te proberen! We hopen dat Haiku u bevalt!\n\nU kunt uw voorkeurstaal en -toetsenbordindeling kiezen uit de lijst, waarna deze onmiddellijk gebruikt zullen worden. U kunt beide instellingen later eenvoudig wijzigen vanaf het bureaublad.\n\nWenst u het installatieprogramma uit te voeren of verder op te starten naar het bureaublad? -Desktop (Live-CD) BootPromptWindow Bureaublad (Live-CD) Language BootPromptWindow Taal Welcome to Haiku! BootPromptWindow Welkom bij Haiku! Run Installer BootPromptWindow Activeer Installer diff --git a/data/catalogs/apps/firstbootprompt/pl.catkeys b/data/catalogs/apps/firstbootprompt/pl.catkeys index e76186a77a..2f76a72505 100644 --- a/data/catalogs/apps/firstbootprompt/pl.catkeys +++ b/data/catalogs/apps/firstbootprompt/pl.catkeys @@ -1,7 +1,6 @@ -1 polish x-vnd.Haiku-FirstBootPrompt 2544294242 +1 polish x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Własne Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Dziękujemy za wypróbowanie Haiku! Mamy nadzieję, że Ci się spodoba!\n\nMożesz wybrać swój język i układ klawiatury z listy po lewej stronie, które to zostaną następnie użyte. Możesz później łatwo zmienić oba ustawienia w ustawieniach Pulpitu.\n\nChcesz od razu przejść do instalatora, czy może kontynuować rozruch do Pulpitu?\n -Desktop (Live-CD) BootPromptWindow Pulpit (Live-CD) Language BootPromptWindow Język Welcome to Haiku! BootPromptWindow Witaj w Haiku! Run Installer BootPromptWindow Uruchom instalator diff --git a/data/catalogs/apps/firstbootprompt/pt_BR.catkeys b/data/catalogs/apps/firstbootprompt/pt_BR.catkeys index e8d55925ed..8e95ba1ae6 100644 --- a/data/catalogs/apps/firstbootprompt/pt_BR.catkeys +++ b/data/catalogs/apps/firstbootprompt/pt_BR.catkeys @@ -1,8 +1,7 @@ -1 portuguese (brazil) x-vnd.Haiku-FirstBootPrompt 2649051796 +1 portuguese (brazil) x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Personalizado -Boot to Desktop BootPromptWindow Inicializar a Área de Trabalho -Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Obrigado por experimentar o Haiku! Esperamos que goste dele!\n\nVocê pode selecionar seu idioma preferido e disposição de teclado a partir da lista à esquerda, os quais serão utilizados imediatamente. Você pode facilmente alterar ambas as definições a partir da Área de Trabalho mais tarde rapidamente.\n\nDeseja executar o Instalador ou continuar inicializando a Área de Trabalho?\n -Language BootPromptWindow Idioma -Welcome to Haiku! BootPromptWindow Bem-vindo ao Haiku! -Run Installer BootPromptWindow Executar o Instalador -Keymap BootPromptWindow Mapa do teclado +Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Obrigado por experimentar o Haiku! Nós esperamos que você se divirta!!\n\nVocê pode escolher sua língua e o layout do teclado da lista na esquerda da qual serão usadas instantaneamente. Você pode facilmente mudar ambas as configurações no Desktop depois.\n\nVocê deseja abrir o Instalar ou continuar a carregar o Desktop?\n +Language BootPromptWindow Linguagem +Welcome to Haiku! BootPromptWindow Bem vindo ao Haiku! +Run Installer BootPromptWindow Executar Instalador +Keymap BootPromptWindow Mapa de Teclas diff --git a/data/catalogs/apps/firstbootprompt/ro.catkeys b/data/catalogs/apps/firstbootprompt/ro.catkeys index 1fe91fa369..6d82bf3755 100644 --- a/data/catalogs/apps/firstbootprompt/ro.catkeys +++ b/data/catalogs/apps/firstbootprompt/ro.catkeys @@ -1,7 +1,6 @@ -1 romanian x-vnd.Haiku-FirstBootPrompt 2544294242 +1 romanian x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Personalizat Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Vă mulțumim că ați încercat Haiku! Sperăm că o să vă placă!\n\nPuteți să selectați limba preferată și aranjamentul de tastatură din lista din stânga care vor fi apoi utilizate automat. Puteți să schimbați ușor mai târziu cele două configurări de pe Desktop.\n\nDoriți să rulați Programul de instalare sau continuați să porniți sistemul?\nNotă: Localizarea aplicațiilor Haiku și a altor componente este un efort susținut. Veți întâlni frecvent șiruri netraduse, dar dacă doriți, puteți să vă implicați în muncă la -Desktop (Live-CD) BootPromptWindow Birou (Live-CD) Language BootPromptWindow Limbaj Welcome to Haiku! BootPromptWindow Bun venit în Haiku! Run Installer BootPromptWindow Rulează Instalator diff --git a/data/catalogs/apps/firstbootprompt/ru.catkeys b/data/catalogs/apps/firstbootprompt/ru.catkeys index 43e15d0bfa..a8c6a21961 100644 --- a/data/catalogs/apps/firstbootprompt/ru.catkeys +++ b/data/catalogs/apps/firstbootprompt/ru.catkeys @@ -1,7 +1,6 @@ -1 russian x-vnd.Haiku-FirstBootPrompt 2544294242 +1 russian x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Пользовательская Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Большое спасибо за то, что решили попробовать Haiku.\nМы очень надеемся, что она вам понравится!\n\nИз списка слева вы можете выбрать предпочитаемый язык и клавиатурную раскладку, которые активируются немедленно. Вы легко сможете изменить эти настройки после запуска рабочего стола без перезагрузки.\n\nВы хотите запустить Установщик или продолжить загрузку рабочего стола?\n -Desktop (Live-CD) BootPromptWindow Рабочий стол (Live-CD) Language BootPromptWindow Язык Welcome to Haiku! BootPromptWindow Добро пожаловать в Haiku! Run Installer BootPromptWindow Запустить Установщик diff --git a/data/catalogs/apps/firstbootprompt/sk.catkeys b/data/catalogs/apps/firstbootprompt/sk.catkeys index 68638601c6..7a8fedb577 100644 --- a/data/catalogs/apps/firstbootprompt/sk.catkeys +++ b/data/catalogs/apps/firstbootprompt/sk.catkeys @@ -1,7 +1,6 @@ -1 slovak x-vnd.Haiku-FirstBootPrompt 2544294242 +1 slovak x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Vlastná Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Ďakujeme, že skúšate Haiku! Dúfame, že sa vám bude páčiť!\n\nZo zoznamu vľavo môžete vybrať váš preferovaný jazyk a rozloženie klávesnice, ktoré sa ihneď použije. Obe nastavenia môžete neskôr jednoducho za behu zmeniť z pracovného prostredia.\n\nChcete spustiť inštalátor alebo pokračovať v zavedení pracovného prostredia?\n -Desktop (Live-CD) BootPromptWindow Pracovné prostredie (živé CD) Language BootPromptWindow Jazyk Welcome to Haiku! BootPromptWindow Vitajte v Haiku! Run Installer BootPromptWindow Spustiť inštalátor diff --git a/data/catalogs/apps/firstbootprompt/sv.catkeys b/data/catalogs/apps/firstbootprompt/sv.catkeys index 57bcf99123..770722a6ab 100644 --- a/data/catalogs/apps/firstbootprompt/sv.catkeys +++ b/data/catalogs/apps/firstbootprompt/sv.catkeys @@ -1,8 +1,7 @@ -1 swedish x-vnd.Haiku-FirstBootPrompt 2649051796 +1 swedish x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Anpassad -Boot to Desktop BootPromptWindow Boota till Skrivbordet -Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Tack för att du testar Haiku! Vi hoppas att du kommer att gilla det!\n \nDu kan ändra till det språk och tangentbordslayout du vill ha från listan till vänster. Valet kommer att gälla direkt. Du kan senare ändra båda inställningarna från skrivbordet\n\nVill du köra installationen eller fortsätta till skrivbordet?\nNotering: Översättning av Haiku till Svenska är något vi arbetar med regelbundet. Du kommer att träffa på delar som inte är översatta. Vill du hjälpa till kan du kontakta oss på .\ +Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Tack för att du testar Haiku! Vi hoppas att du kommer att gilla det!\n\nDu kan välja ditt föredragna språk och tangentbordslayout från listan till vänster. Du kan enkelt byta båda inställningarna från skrivbordet vid ett senare tillfälle.\n\nVill du starta Installeraren eller gå direkt till skrivbordet?\n Language BootPromptWindow Språk Welcome to Haiku! BootPromptWindow Välkommen till Haiku! -Run Installer BootPromptWindow Kör Installationen -Keymap BootPromptWindow Tangentkarta +Run Installer BootPromptWindow Starta Installeraren +Keymap BootPromptWindow Tangentbordslayout diff --git a/data/catalogs/apps/firstbootprompt/uk.catkeys b/data/catalogs/apps/firstbootprompt/uk.catkeys index c7cad64ae0..4795beac97 100644 --- a/data/catalogs/apps/firstbootprompt/uk.catkeys +++ b/data/catalogs/apps/firstbootprompt/uk.catkeys @@ -1,7 +1,6 @@ -1 ukrainian x-vnd.Haiku-FirstBootPrompt 2544294242 +1 ukrainian x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow Задане Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Дякуємо за ваше зацікавлення Haiku. Ми надіємося що вона Вам сподобається!\n\nВи можете вибрати бажану мову і розкладку клавіатури зі списку зліва при використанні. Ви можете просто змінити обидві настройки Робочого столу на льоту .\n\nDo you wish to run the Installer or continue booting to the Desktop?\n -Desktop (Live-CD) BootPromptWindow Робочий стіл (Live-CD) Language BootPromptWindow Мова Welcome to Haiku! BootPromptWindow Ласкаво просимо в Haiku! Run Installer BootPromptWindow Виконати встановлення diff --git a/data/catalogs/apps/firstbootprompt/zh_Hans.catkeys b/data/catalogs/apps/firstbootprompt/zh_Hans.catkeys index 999699fcc1..4374251f8f 100644 --- a/data/catalogs/apps/firstbootprompt/zh_Hans.catkeys +++ b/data/catalogs/apps/firstbootprompt/zh_Hans.catkeys @@ -1,7 +1,6 @@ -1 english x-vnd.Haiku-FirstBootPrompt 2544294242 +1 english x-vnd.Haiku-FirstBootPrompt 988630706 Custom BootPromptWindow 自定义 Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" 欢迎使用 Haiku！希望喜欢它！\n\n您可以从左边的列表中选择首选语言和键盘类型，它们将马上启用。您可以在进入桌面之后进行修改。\n\n您希望运行系统安装器，还是继续引导进入桌面？ -Desktop (Live-CD) BootPromptWindow 桌面系统 (Live-CD) Language BootPromptWindow 语言 Welcome to Haiku! BootPromptWindow 欢迎使用 Haiku! Run Installer BootPromptWindow 运行系统安装器 diff --git a/data/catalogs/apps/fontdemo/de.catkeys b/data/catalogs/apps/fontdemo/de.catkeys index 86bbdb7c47..7d7eafac6b 100644 --- a/data/catalogs/apps/fontdemo/de.catkeys +++ b/data/catalogs/apps/fontdemo/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-FontDemo 1300625863 +1 german x-vnd.Haiku-FontDemo 3522850500 Outline: ControlView Kontur: Size: 50 ControlView Größe: 50 Stop cycling ControlView Schriftwechsel anhalten @@ -14,6 +14,7 @@ Rotation: 0 ControlView Drehung: 0 Drawing mode: ControlView Zeichenmodus: Haiku, Inc. ControlView Haiku, Inc. Controls FontDemo Bedienelemente +FontDemo System name SchriftartDemo Outline: %d ControlView Kontur: %d Text: ControlView Text: Antialiased text ControlView Text-Antialiasing diff --git a/data/catalogs/apps/fontdemo/sv.catkeys b/data/catalogs/apps/fontdemo/sv.catkeys index 1effc59bbd..72fda11410 100644 --- a/data/catalogs/apps/fontdemo/sv.catkeys +++ b/data/catalogs/apps/fontdemo/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-FontDemo 1300625863 +1 swedish x-vnd.Haiku-FontDemo 3522850500 Outline: ControlView Kontur: Size: 50 ControlView Storlek: 50 Stop cycling ControlView Sluta rotera @@ -14,6 +14,7 @@ Rotation: 0 ControlView Rotation: 0 Drawing mode: ControlView Ritläge: Haiku, Inc. ControlView Haiku, Inc. Controls FontDemo Kontroller +FontDemo System name Font Demo Outline: %d ControlView Kontur: %d Text: ControlView Text: Antialiased text ControlView Kantutjämnad text diff --git a/data/catalogs/apps/icon-o-matic/ja.catkeys b/data/catalogs/apps/icon-o-matic/ja.catkeys index 56310a1729..eb53ab2307 100644 --- a/data/catalogs/apps/icon-o-matic/ja.catkeys +++ b/data/catalogs/apps/icon-o-matic/ja.catkeys @@ -60,7 +60,7 @@ Joins Icon-O-Matic-PropertyNames 結合 Remove Style Icon-O-Matic-RemoveStylesCmd スタイルを削除 Scale X Icon-O-Matic-PropertyNames X軸スケール Set Set (property name) セット -Cancel Icon-O-Matic-SVGExport キャンセル +Cancel Icon-O-Matic-SVGExport 中止 Add shape with style Icon-O-Matic-Menu-Shape スタイルつきのシェイプを追加 Remove Shape Icon-O-Matic-RemoveShapesCmd シェイプを削除 Reverse Icon-O-Matic-PathsList 反転 @@ -81,7 +81,7 @@ Opacity Icon-O-Matic-PropertyNames 不透明度 Add with path Icon-O-Matic-ShapesList パスとともに追加 Gradient type Icon-O-Matic-StyleTypes グラデーションのタイプ Icon-O-Matic System name Icon-O-Matic -Cancel Icon-O-Matic-Menu-Settings キャンセル +Cancel Icon-O-Matic-Menu-Settings 中止 Modify Control Point Icon-O-Matic-ChangePointCmd コントロールポイントの編集 Saving your document failed! Icon-O-Matic-Exporter ドキュメントの保存に失敗しました！ edit it's properties here. Empty property list - 3rd line オブジェクトをクリックしてください。 @@ -133,7 +133,7 @@ Split Control Points Icon-O-Matic-SplitPointsCmd コントロールポイント Save Icon-O-Matic-Menu-Settings 保存 Add empty Icon-O-Matic-ShapesList 空のシェイプを追加 Close Icon-O-Matic-Menu-File 閉じる -Cancel Icon-O-Matic-ColorPicker キャンセル +Cancel Icon-O-Matic-ColorPicker 中止 Paste Icon-O-Matic-Properties 貼り付け Shape Icon-O-Matic-Menus シェイプ Translation X Icon-O-Matic-PropertyNames X軸移動 @@ -176,7 +176,7 @@ Add Path Icon-O-Matic-AddPathsCmd パスを追加 Color Icon-O-Matic-PropertyNames カラー Insert Control Point Icon-O-Matic-InsertPointCmd コントロールポイントを挿入 Flip Control Point Icon-O-Matic-FlipPointsCmd コントロールポイントを反転 -Redo Icon-O-Matic-Main やり直す +Redo Icon-O-Matic-Main やり直し Assign Paths Icon-O-Matic-AddPathsCmd パスを割り当てる OK Icon-O-Matic-SVGImport OK Multi paste Icon-O-Matic-Properties 複数貼り付け diff --git a/data/catalogs/apps/installer/ja.catkeys b/data/catalogs/apps/installer/ja.catkeys index 51eda0f6ad..b6bce73556 100644 --- a/data/catalogs/apps/installer/ja.catkeys +++ b/data/catalogs/apps/installer/ja.catkeys @@ -89,7 +89,7 @@ Have fun and thanks a lot for trying out Haiku! We hope you like it! InstallerAp OK InstallProgress OK Please choose target InstallerWindow インストール先の選択 ??? InstallerWindow Unknown partition name ??? -1) If you are installing Haiku onto real hardware (not inside an emulator) it is recommended that you have already prepared a hard disk partition. The Installer and the DriveSetup tool offer to initialize existing partitions with the Haiku native file system, but the options to change the actual partition layout may not have been tested on a sufficiently great variety of computer configurations so we do not recommend using it.\n InstallerApp 1) Haikuを(エミュレータでなく)実機にインストールする場合は、ハードディスクのパーティションを先に用意しておくことが望ましいです。インストーラーおよびDriveSetupツールには、Haikuファイルシステムによる既存のパーティションの初期化機能があります。しかし、パーティションを作成、変更するオプションは充分な多種多様のコンピュータの構成でテストされていないため、使用を勧めません。\n +1) If you are installing Haiku onto real hardware (not inside an emulator) it is recommended that you have already prepared a hard disk partition. The Installer and the DriveSetup tool offer to initialize existing partitions with the Haiku native file system, but the options to change the actual partition layout may not have been tested on a sufficiently great variety of computer configurations so we do not recommend using it.\n InstallerApp 1) Haikuを(エミュレータでなく)実機にインストールする場合は、ハードディスクのパーティションを先に用意しておくことが望ましいです。インストーラーおよびDriveSetupツールには、Haikuファイルシステムによる既存のパーティションの初期化機能があります。しかし、パーティションを作成、変更するオプションは充分な多種多様のコンピューターの構成でテストされていないため、使用を勧めません。\n 2) The Installer will make the Haiku partition itself bootable, but takes no steps to integrate Haiku into an existing boot menu. If you have GRUB already installed, you can add Haiku to its boot menu. Depending on what version of GRUB you use, this is done differently.\n\n\n InstallerApp 2) インストーラーは、Haikuのパーティションを起動可能にします。しかし、Haikuを既存のブートメニューに結合する機能はありません。すでにGRUBがインストールされている場合、ブートメニューにHaikuを追加できます。追加作業は、使用しているGRUBのバージョンによって異なります。\n\n\n Begin InstallerWindow 開始 Finally, you have to update the boot menu by entering:\n\n InstallerApp 最後に、次のように入力して、ブートメニューをアップデートする必要があります。 diff --git a/data/catalogs/apps/launchbox/ja.catkeys b/data/catalogs/apps/launchbox/ja.catkeys index 78cbf00375..136fced848 100644 --- a/data/catalogs/apps/launchbox/ja.catkeys +++ b/data/catalogs/apps/launchbox/ja.catkeys @@ -15,7 +15,7 @@ Show window border LaunchBox ウィンドウ枠を表示 Pad LaunchBox パッド Icon size LaunchBox アイコンサイズ Bummer LaunchBox 失敗 -Cancel LaunchBox キャンセル +Cancel LaunchBox 中止 Remove button LaunchBox ボタンを削除 Horizontal layout LaunchBox 水平配置 \n\nFailed to launch application with signature '%2'.\n\nError: LaunchBox \n\nアプリケーション (シグネチャ '%2') の起動に失敗しました。\n\nエラー: diff --git a/data/catalogs/apps/magnify/be.catkeys b/data/catalogs/apps/magnify/be.catkeys index 91b799858d..9f0c1f9852 100644 --- a/data/catalogs/apps/magnify/be.catkeys +++ b/data/catalogs/apps/magnify/be.catkeys @@ -1,26 +1,18 @@ -1 belarusian x-vnd.Haiku-Magnify 283320408 +1 belarusian x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image буфер пусты\n Make square Magnify-Main Зрабіць квадратным Copy image Magnify-Main Капіяваць выяву -Magnify help Magnify-Help Дапамога Magnify usage: magnify [size] (magnify size * size pixels)\n Console карыстанне: magnify [size] (павялічыць size * size пікселяў)\n Stick coordinates Magnify-Main Прыляпіць каардынаты -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Інфа:\n hide/show info - хавае/паказвае новыя магчымасці\n увага: чырвоны квадрат што з´яўляецца падчас прагляду паказвае\n якія RGB велічыні пікселяў будуць адлюстраваны\n add/remove crosshairs - можна дадаць ці выдаліць 2 перакрыжаванні\n каб спрасціць выраўнованне ды размяшчэнне аб´ектаў.\n Перакрыжаванні адлюстраваны блакітнымі квадратамі і блакітнымі лініямі.\n hide/show grid - паказаць ці схаваць сетку, што падзяляе выяву на пікселі\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help freeze - блакуе/разблакуе павялiчванне\n дзе бы нi знахадзiўся курсор\n Hide/Show grid Magnify-Main Схаваць/Паказаць сетку magnify: size must be a multiple of 4\n Console magnify: памер павінен быць кратны 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Агульныя:\n 32 x 32 - верхнія левыя лічбы - колькасць бачных\n пікселяў (шырыня x вышыня)\n 8 пікселяў на піксель - паказвае, колькі пікселяў\n выкарыстана, каб павялічыць адзін піксель\n R:152 G:52 B:10 - RGB значэнні пікселя пад чырвоным квадратам\n -Help Magnify-Main Дапамога -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Пазначэнне/Змяненне памеру:\n зрабіць квадратным - прызначае шырыню і вышыню па большаму з бакоў\n і стварае квадратную выяву\n павялічыць/паменшыць памер вакна - расцягвае або сціскае памер\n вакна на 4 пікселя.\n нататка: гэтае вакно таксама можна расцягнуць да любога памеру\n з дапамогай спецыяльнай вобласці ў вакне\n павялічыць/паменшыць памер пікселяў - павялічвае ці паменшвае\n колькасць пікселяў на 'рэальны' піксель. Інтэрвал - з 1 да 16.\n Decrease pixel size Magnify-Main Паменшыць памер пікселяў Magnify System name Лупа %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize пікселяў на піксель Info Magnify-Main Інфармацыя Remove a crosshair Magnify-Main Выдаліць перакрыжаванне Freeze/Unfreeze image Magnify-Main Замарозіць/Размарозіць выяву -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Капіяванне/Захаванне:\n капіяваць - капіруе цякучую выяву у буфер\n захаваць - пытае у карыстача файл, у які захоўваць\n і запісвае туды выяву\n Hide/Show info Magnify-Main Схаваць/Паказаць інфармацыю -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Навігацыя:\n стрэлкі - перамясціць цякучае выдзяленне (індыкатар RGB або перакрыжаванне)\n на 1 піксель за раз\n апцыянальныя стрэлкі - перамяшчае курсор на 1 піксель за раз\n x пазначае выдяленне - цякучае выдзяленне мае 'x'\n Save image Magnify-Main Захаваць выяву Increase window size Magnify-Main Павялічыць памер вакна Decrease window size Magnify-Main Паменшыць памер вакна diff --git a/data/catalogs/apps/magnify/de.catkeys b/data/catalogs/apps/magnify/de.catkeys index bd8a98ba82..a4ae8b8046 100644 --- a/data/catalogs/apps/magnify/de.catkeys +++ b/data/catalogs/apps/magnify/de.catkeys @@ -1,26 +1,18 @@ -1 german x-vnd.Haiku-Magnify 283320408 +1 german x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image no clip msg\n Make square Magnify-Main Quadratisches Fenster Copy image Magnify-Main Bild kopieren -Magnify help Magnify-Help Magnify-Hilfe usage: magnify [size] (magnify size * size pixels)\n Console Gebrauch: Magnify [Größe] (Fenstergröße * Pixelgröße)\n Stick coordinates Magnify-Main Koordinaten einfrieren -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Info:\nInfos aus-/einblenden - blendet Informationen zu Fenster- und Pixelgröße ein/aus.\nDas kleine rote Quadrat markiert den Pixel, dessen Farbe als RGB-Wert angezeigt wird.\nFadenkreuz hinzufügen/entfernen - bis zu zwei Fadenkreuze, dargestellt durch blaue\n Quadrate und Linien, helfen beim Ausrichten von Objekten.\nGitter aus-/einblenden - steuert ein Gitter, das sich über die Pixel legt.\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help Bild einfrieren/freigeben - friert die momentane Darstellung ein \noder gibt sie wieder frei.\n Hide/Show grid Magnify-Main Gitter aus-/einblenden magnify: size must be a multiple of 4\n Console magnify: Größe muss ein Vielfaches von 4 sein\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Allgemein:\n32 x 32 - die linken oberen Zahlen sind die Anzahl der sichtbaren\n Pixel (Breite x Höhe)\n8 Pixel/Pixel - steht für die Anzahl der Pixel, mit\nder ein Pixel vergrößert wird.\nR:152 G:52 B:10 - die RGB Werte des Pixels unter\ndem roten Quadrat.\n -Help Magnify-Main Hilfe -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Größe ändern:\nQuadratisches Fenster - setzt die Breite und Höhe zur größeren \nder beiden, um ein quadratisches Bild zu bekommen.\nFenster vergrößern/verkleinern - lässt die Fenstergröße\num 4 Pixel wachsen oder schrumpfen.\nPixel vergrößern/verkleinern - erhöht oder senkt die Anzahl\n an Pixeln die benutzt werden, um einen 'echten' Pixel\nzu vergrößern. Der Bereich geht von 1 bis 16.\n Decrease pixel size Magnify-Main Pixel verkleinern Magnify System name Lupe %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize Pixel/Pixel Info Magnify-Main Info Remove a crosshair Magnify-Main Fadenkreuz entfernen Freeze/Unfreeze image Magnify-Main Bild einfrieren/freigeben -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Bild kopieren/speichern:\nKopieren - kopiert das aktuelle Bild in die Zwischenablage\nSpeichern - speichert das Bild als Bits, die in Header-Dateien\nbei der Programmierung genutzt werden können.\n Hide/Show info Magnify-Main Infos aus-/einblenden -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navigation:\nPfeiltasten - die aktuelle Auswahl bewegen (RGB-Anzeiger oder Fadenkreuz)\nDie aktuelle Auswahl hat ein 'x' im Quadrat.\nOPT+Pfeiltaste - bewegt den Mauszeiger.\n Save image Magnify-Main Bild speichern Increase window size Magnify-Main Fenster vergrößern Decrease window size Magnify-Main Fenster verkleinern diff --git a/data/catalogs/apps/magnify/el.catkeys b/data/catalogs/apps/magnify/el.catkeys index 6e4fba840e..1733920fc6 100644 --- a/data/catalogs/apps/magnify/el.catkeys +++ b/data/catalogs/apps/magnify/el.catkeys @@ -1,25 +1,18 @@ -1 greek, modern (1453-) x-vnd.Haiku-Magnify 2227745383 +1 greek, modern (1453-) x-vnd.Haiku-Magnify 3914403817 no clip msg\n In console, when clipboard is empty after clicking Copy image κανένα μήνυμα κλιπ\n Make square Magnify-Main Δημιουργία τετραγώνου Copy image Magnify-Main Αντιγραφή εικόνας -Magnify help Magnify-Help Μεγέθυνση βοήθεια usage: magnify [size] (magnify size * size pixels)\n Console χρήση: μεγέθυνση [μέγεθος] (μέγεθος μεγέθυνσης * μέγεθος εικονοστοιχείων)\n Stick coordinates Magnify-Main Συντεταγμένες Στίκ -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Πληροφορίες:\n απόκρυψη/εμφάνιση πληροφοριών - αποκρύπτει/εμφανίζει όλα αυτά τα νέα χαρακτηριστικά\nσημείωση: κατά την εμφάνιση, ένα κόκκινο τετράγωνο θα εμφανιστεί που προσδιορίζει\n ποιές rgb αξίες των εικονοστοιχείων θα εμφανίζονται\n προσθήκη/αφαίρεση σταυρονημάτων - 2 σταυρονήματα μπορούν να προστεθούν (ή να αφαιρεθούν)\n για να βοηθήσουν στην ευθυγράμμιση και την τοποθέτηση των αντικειμένων.\n Τα σταυρονήματα εκπροσωπούνται από μπλε τετράγωνα και μπλε γραμμές.\n απόκρυψη/εμφάνιση πλέγματος - αποκρύπτει/εμφανίζει το πλέγμα που χωρίζει κάθε εικονοστοιχείο\n Hide/Show grid Magnify-Main Απόκρυψη/Εμφάνιση πλέγματος magnify: size must be a multiple of 4\n Console Μεγέθυνση: το μέγεθος πρέπει να είναι πολλαπλάσιο του 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n -Help Magnify-Main Βοήθεια -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Tαξινόμηση κατά μέγεθος/Αλλαγή μεγέθους:\n τετραγωνοποίηση - ορίζει το πλάτος και το ύψος του μεγαλύτερου\n εκ των δύο που σχηματίζουν μια τετράγωνη εικόνα\n αύξηση/μείωση μεγέθους του παραθύρου - μεγαλώνει ή μικραίνει το μέγεθος\n παραθύρου κατά 4 εικονοστοιχεία.\n σημείωση: αυτό το παράθυρο μπορεί να αλλάξει το μέγεθός του σε οποιοδήποτε άλλο μέσω της\n περιοχής αλλαγής μεγέθους του παραθύρου\n αύξηση/μείωση μεγέθους του εικονοστοιχείου - αυξάνει ή μειώνει τον αριθμό\n των εικονοστοιχείων που χρησιμοποιούνται για να μεγεθύνετε ένα 'πραγματικό' εικονοστοιχείο. Το εύρος τιμών είναι από 1 έως 16.\n Decrease pixel size Magnify-Main Μείωση μεγέθους εικονοστοιχείου Magnify System name Magnify %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize εικονοστοιχεία/εικονοστοιχείο Info Magnify-Main Πληροφορίες Remove a crosshair Magnify-Main Αφαίρεση ενός σταυρονήματος Freeze/Unfreeze image Magnify-Main Πάγωμα/Ξεπάγωμα εικόνας -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Αντιγραφή/Αποθήκευση\n αντιγραφή - αντιγράφει την τρέχουσα εικόνα στο πρόχειρο\n αποθήκευση - προτείνει στον χρήστη ένα αρχείο για αποθήκευση και γράφει\n τα εικονοστοιχεία της εικόνας\n Hide/Show info Magnify-Main Απόκρυψη/Εμφάνιση πληροφορίας -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Πλοήγηση:\n πλήκτρα βέλους - μετακινήστε την τρέχουσα επιλογή (δείκτης rgb ή σταυρόνημα)\n περίπου 1 εικονοστοιχείο κάθε φορά\n option-arrow key - μετακινεί την τοποθεσία του ποντικιού κατά 1 εικονοστοιχείο κάθε φορά\n το x σημαδεύει την επιλογή - η τρέχουσα επιλογή έχει ένα 'x' σε αυτή\n Save image Magnify-Main Αποθήκευση εικόνας Increase window size Magnify-Main Αύξηση μεγέθους του παραθύρου Decrease window size Magnify-Main Μείωση μεγέθους του παραθύρου diff --git a/data/catalogs/apps/magnify/fi.catkeys b/data/catalogs/apps/magnify/fi.catkeys index 028f54924c..ca521067aa 100644 --- a/data/catalogs/apps/magnify/fi.catkeys +++ b/data/catalogs/apps/magnify/fi.catkeys @@ -1,26 +1,18 @@ -1 finnish x-vnd.Haiku-Magnify 283320408 +1 finnish x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image ei leikeviestiä\n Make square Magnify-Main Tee neliö Copy image Magnify-Main Kopioi kuva -Magnify help Magnify-Help Suurentamisopaste usage: magnify [size] (magnify size * size pixels)\n Console käyttö: magnify [koko] (suurennuskoko * pikselien koko)\n Stick coordinates Magnify-Main Tarttumiskoordinaatit -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Info:\n piilota/näytä tiedot - piilottaa/näyttää kaikki nämä uudet ominaisuudet\n huomaa: näytettäessä punainen neliö ilmestyy merkiten\n minkä pikselin rgb-arvoja näytetään\n lisää/poista ristikkotähtäin - 2 ristikkotähtäintä voidaan lisätä (tai poistaa)\n objektien tasauksen tai sijoittelun avuksi.\n Siniset neliöt ja viivat esittävät ristikkotähtäimiä.\n piilota/näytä rasteri - piilottaa/näyttää rasterin, joka erottelee jokaisen pikselin\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help jäädytä - jähmetä/vapauta suurennus, mitä onkin\nparhaillaan hiiren kohdistimen alla\n Hide/Show grid Magnify-Main Piilota/näytä rasteri magnify: size must be a multiple of 4\n Console suurenna: koon on oltava neljän monikerta\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Yleistä:\n 32 x 32 - vasemman yläkulman numerot ovat näkyvien pikseleiden\n lukumäärä (leveys x korkeus)\n 8 pikseliä/pikseli - edustaa niiden pikseleiden lukumäärää, jotka on\n käytetty suurentamaan pikseli\n R:152 G:52 B:10 - RGB-arvot punaisen neliön\n alla oleville pikseleille\n -Help Magnify-Main Opaste -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Koon muuttaminen/uudelleenmuuttaminen:\n tee neliö - asettaa leveyden ja korkeuden tarpeeksi suureksi\n näistä kahdesta neliön tekemiseksi\n kasvata/pienennä ikkunakokoa - kasvattaa tai kutistaa ikkunan kokoa neljällä pikselillä.\n huomaa: tämä ikkuna voidaan skaalata mihin kokoon tahansa\n skaalaamalla ikkunan alue\n kasvata/pienennä pikselikokoa - kasvattaa tai pienentää 'oikean' pikselin suurentamiseen\n käytettyjen pikseleiden lukumäärää. Lukualue on 1 ... 16.\n Decrease pixel size Magnify-Main Pienennä pikselikokoa Magnify System name Suurennuslasi %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pikseliä/pikseli Info Magnify-Main Tiedot Remove a crosshair Magnify-Main Poista ristikkotähtäin Freeze/Unfreeze image Magnify-Main Jähmetä/vapauta kuva -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Kopioi/Tallenna:\n kopioi - kopioi nykyisen kuvan leikepöydälle\n tallenna - kysyy käyttäjältä tallennettavan tiedoston\n johon kuvan bitit tallennetaan\n Hide/Show info Magnify-Main Piilota/näytä tiedot -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navigaatio:\n nuolinäppäimet - siirrä nykyinen valinta (rgb-indikaattori tai ristikkotähtäin)\n noin 1 pikseliä kerrallaan\n valitsin-nuolinäppäin - siirtää hiiren sijaintia 1 pikseli kerrallaan\n x merkitsee valinnan - nykyisessä valinnassa on 'x' siinä\n Save image Magnify-Main Tallenna kuva Increase window size Magnify-Main Kasvata ikkunan kokoa Decrease window size Magnify-Main Pienennä ikkkunan kokoa diff --git a/data/catalogs/apps/magnify/fr.catkeys b/data/catalogs/apps/magnify/fr.catkeys index 551fa0203a..ef15378992 100644 --- a/data/catalogs/apps/magnify/fr.catkeys +++ b/data/catalogs/apps/magnify/fr.catkeys @@ -1,26 +1,18 @@ -1 french x-vnd.Haiku-Magnify 283320408 +1 french x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image aucun clip\n Make square Magnify-Main Rendre carré Copy image Magnify-Main Copier l'image -Magnify help Magnify-Help Aide de la Loupe usage: magnify [size] (magnify size * size pixels)\n Console utilisation : magnify [taille] (taille d'agrandissement * taille des pixels)\n Stick coordinates Magnify-Main Mémoriser les coordonnées -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Informations :\n cacher/afficher les informations - cache ou affiche toutes les nouvelles fonctionnalités\n note : Lorsqu'un carré rouge apparait\n Il indique sur quel pixel la valeur de couleur RVB est mesurées\n Ajouter/Enlever un viseur - 2 viseurs peuvent être ajoutés (ou retirés...)\n pour aider à aligner et placer des objets\n les viseurs sont représentés par des carrés bleus et des lignes bleus\n montrer/cacher la grille - montre ou cache la grille séparant chaque pixel\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help freeze - gèle/dégèle le grossissement quel que soit l'endroit\n où se trouve le curseur\n Hide/Show grid Magnify-Main Cacher/afficher la grille magnify: size must be a multiple of 4\n Console Loupe : la taille doit être un multiple de 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Général :\n 32⨯32 - les nombres dans le coin supérieur gauche représentent\n le nombre de pixels affichés (largeur ⨯ hauteur).\n 8 pixels/pixel - représente le facteur de grossissement des pixels.\n R:152 V:52 B:10 - les valeurs RVB du pixel sous le carré rouge.\n -Help Magnify-Main Aide -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Dimensionnement/Redimensionnement :\n Rendre carré - définit la largeur et la hauteur à la plus grande\n des deux pour faire une image carrée.\n Augmenter/Diminuer la taille de la fenêtre - aug.mente ou\n diminue la taille de la fenêtre de 4 pixels.\n note : la fenêtre peut également être redimensionnée à\n n'importe quelle taille par l'intermédiaire de sa poignée.\n Augmenter/Réduire le grossissement - augmente ou diminue\n le nombre de pixels utilisés pour grossir un « vrai » pixel, le\n grossissement allant de 1 à 16.\n Decrease pixel size Magnify-Main Réduire le grossissement Magnify System name Loupe %width x %height @ %pixelSize pixels/pixel Magnify-Main %width ⨯ %height @ %pixelSize pixels/pixel Info Magnify-Main Information Remove a crosshair Magnify-Main Enlever un viseur Freeze/Unfreeze image Magnify-Main Gèle/Dégèle l'image -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Copier/Enregistrer :\n copier - copie l'image vers le presse-papier\n enregistrer : demande à l'utilisateur de spécifier un fichier\n de destination où enregistrer l'image\n Hide/Show info Magnify-Main Cacher/Afficher les informations -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navigation :\n les flèches de direction - déplacent l'élément sélectionné (l'indicateur\n RVB ou les viseurs) pixel par pixel\n les flèches de direction+ - déplacent le curseur pixel par pixel\n x indique la sélection en cours\n Save image Magnify-Main Enregistrer l'image Increase window size Magnify-Main Augmenter la taille de la fenêtre Decrease window size Magnify-Main Diminuer la taille de la fenêtre diff --git a/data/catalogs/apps/magnify/hi.catkeys b/data/catalogs/apps/magnify/hi.catkeys index be6261f1b1..e7e5af7129 100644 --- a/data/catalogs/apps/magnify/hi.catkeys +++ b/data/catalogs/apps/magnify/hi.catkeys @@ -1,23 +1,18 @@ -1 hindi x-vnd.Haiku-Magnify 2043945964 +1 hindi x-vnd.Haiku-Magnify 3914403817 no clip msg\n In console, when clipboard is empty after clicking Copy image कोई क्लिप नहीं msg\n Make square Magnify-Main चौकोर बनाओ Copy image Magnify-Main छवि की प्रतिलिपि बनाएँ -Magnify help Magnify-Help मदद का आवर्धन करे usage: magnify [size] (magnify size * size pixels)\n Console उपयोग: आवर्धन[size] (magnify size * size pixels)\n Stick coordinates Magnify-Main स्टिक निर्देशांक -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help जानकारी:\nछिपाना /जानकारी दिखाने -छुपाता/दिखाता है सभी नई सुविधाओं\nनोट: जब दिखा रहा है, एक लाल वर्ग दिखाई देगा जो दर्शाता है\nजो पिक्सेल आरजीबी मूल्यों को प्रदर्शित किया जाएगा \nजोड़ /क्रॉसहेयर हटायें-- 2 क्रॉसहेयर (या हटाया) जोड़ा जा सकता है \n और वस्तुओं की नियुक्ति संरेखण में सहायता\n क्रॉसहेयर नीला चौकों और नीले लाइनों द्वारा प्रतिनिधित्व कर रहे हैं \n छिपा / ग्रिड शो -.. छुपाता /दिखाता है ग्रिड जो प्रत्येक पिक्सेल अलग करता\n Hide/Show grid Magnify-Main ग्रिड को छिपाएँ/दिखाएँ magnify: size must be a multiple of 4\n Console आवर्धन: आकार 4 की एक बहु\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help सामान्य:32 x 32 -ऊपरी बाएँ संख्या दृश्यमान संख्या है\nपिक्सल (चौड़ाई x ऊँचाई )की\n 8 पिक्सलस/पिक्सल -पिक्सल की संख्या का प्रतिनिधित्व करता है \n जो एक पिक्सेल आवर्धन इस्तेमाल करता है \n R:152 G:52 B:10 -RGB मूल्य पिक्सेल के तहत \nलाल वर्ग\n Decrease pixel size Magnify-Main पिक्सेल आकार घटाएँ Magnify System name मग्निफ्य %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize पिक्सलस/पिक्सेल Info Magnify-Main जानकारी Remove a crosshair Magnify-Main क्रोसहैर हटायें Freeze/Unfreeze image Magnify-Main छवि को फ्रीज/अन्फ्रीज़ कर देना -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help प्रतिलिपि बनाएँ / सहेजें:\n प्रतिलिपि बनाएँ-क्लिपबोर्ड पर मौजूदा छवि की प्रतियां बनाए\n सहेजें-एक फ़ाइल के लिए उपयोगकर्ता को बचाने के लिए प्रेरित करता है और बाहर छवि की बिट्स लिखता है\n Hide/Show info Magnify-Main छिपाएँ/जानकारी दिखाएँ -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help नेविगेशन:\n ऐरो चाबियाँ - वर्तमान चयन को ले जाएँ (आरजीबी सूचक या क्रॉस हेर)\n एक समय में लगभग एक पिक्सेल\n विकल्प-ऐरो की - एक बार में माउस स्थान एक पिक्सेल ले जाएँ\n एक्स चयन को मार्क करता है - वर्तमान चयन किया है इसमें एक 'एक्स' हैं\n Save image Magnify-Main छवि को सुरक्षित करे Increase window size Magnify-Main विंडो का आकार बढ़ाएँ Decrease window size Magnify-Main विंडो का आकार घटाएँ diff --git a/data/catalogs/apps/magnify/hu.catkeys b/data/catalogs/apps/magnify/hu.catkeys index d5f37a6ea9..4277bbe278 100644 --- a/data/catalogs/apps/magnify/hu.catkeys +++ b/data/catalogs/apps/magnify/hu.catkeys @@ -1,26 +1,18 @@ -1 hungarian x-vnd.Haiku-Magnify 283320408 +1 hungarian x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image nincs semmi a vágólapon Make square Magnify-Main Négyzetté alakítás Copy image Magnify-Main Kép másolása -Magnify help Magnify-Help Nagyító súgója usage: magnify [size] (magnify size * size pixels)\n Console használat: magnify [méret] (nagyítási méret * méret képpontban)\n Stick coordinates Magnify-Main Koordináták rögzítése -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Infó:\n információ rejtése/megjelenítése - elrejti/megjeleníti ezeket az új funkciókat\n megjegyzés: ha megjelenítés alatt van, egy vörös négyzet\n fog megjelenni, ami azt jelzi, hogy melyik képpont\n adatait jelzi épp ki\n célkeresztek hozzáadása/eltávolítása - 2 célkereszt lehet\ maximum,\n amik segítenek az objektumok elrendezésében és elhelyezésében.\n A célkereszteket kék négyzetek és vonalak jelzik.\n rácsvonalak elrejtése/megjelenítése - elrejti/megjeleníti a képpontok közti rácsot\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help fagyasztás - a kurzor alatti terület fagyasztása/felolvasztása Hide/Show grid Magnify-Main Rácsvonalak elrejtése/megjelenítése magnify: size must be a multiple of 4\n Console nagyítás: a méret 4-gyel osztható kell, hogy legyen\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Általános:\n 32 x 32 - a bal felül lévő számok a látható képpontok\n számát jelzik (szélesség x magasság)\n 8 képpont/képpont - azt mutatja, hogy egy képpont nagyítására hány\n képpontot használ fel\n R:152 G:52 B:10 - a vörös négyzet alatti\n képpont RGB értékei\n -Help Magnify-Main Súgó -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Átméretezés:\n négyzetté alakítás - a szélességet és magasságot a nagyobbal\n teszi egyenlővé, hogy négyzet legyen\n ablak méretének növelése/csökkentése - 4 képponttal nagyobbá vagy kisebbé\n teszi az ablakot.\n megjegyzés: az ablak keretének elhúzásával is át\n lehet méretezni az ablakot bármilyen méretűre.\n képpont méretének növelése/csökkentése - növeli vagy csökkenti a képpontok számát\n ami azt adja meg, hogy hányszorosan nagyítson egy valós\n képpontot. 1-től 16-ig terjedhet.\n Decrease pixel size Magnify-Main Képpontméret csökkentése Magnify System name Nagyító %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize képpont/képpont Info Magnify-Main Infó Remove a crosshair Magnify-Main Célkereszt eltávolítása Freeze/Unfreeze image Magnify-Main Kép rögzítése/feloldása -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Másolás/Mentés:\n másolás - a vágólapra másolja a jelenlegi képet\n mentés - elmenti a kép bitjeit egy, a\n felhasználtó által megadott fájlba\n Hide/Show info Magnify-Main Infó elrejtése/megjelenítése -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navigáció:\n nyílgombok - a jelenlegi kijelölést elmozdítja 1 képponttal\n option-nyílgombok - elmozdítja az egeret 1 képponttal\n x jelzi a kijelölést - a jelenlegi kijelölésben van egy 'x'\n Save image Magnify-Main Kép mentése Increase window size Magnify-Main Ablak méretének növelése Decrease window size Magnify-Main Ablak méretének csökkentése diff --git a/data/catalogs/apps/magnify/ja.catkeys b/data/catalogs/apps/magnify/ja.catkeys index bf2179315d..daadbc4fcc 100644 --- a/data/catalogs/apps/magnify/ja.catkeys +++ b/data/catalogs/apps/magnify/ja.catkeys @@ -1,26 +1,18 @@ -1 japanese x-vnd.Haiku-Magnify 283320408 +1 japanese x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image クリップボードにコピーされていません\n Make square Magnify-Main 正方形を作成 Copy image Magnify-Main イメージをコピー -Magnify help Magnify-Help 拡大鏡のヘルプ usage: magnify [size] (magnify size * size pixels)\n Console usage: magnify [size] (magnify size * size pixels)\n Stick coordinates Magnify-Main 座標を固定 -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help 情報:\n 情報の表示/非表示 - これらの新機能を表示または非表示にします\n 注意: 表示時には、ピクセルを指し示す赤い四角が現れて、\n その rgb 値が表示されます。\n 十字カーソルを追加/削除 - オブジェクトの位置合わせや配置のために\n 2 個の十字カーソルを追加できます (または削除できます)。\n カーソルは青い四角と線で表示されます。\n グリッドの表示/非表示 - それぞれのピクセルを隔てるグリッドを表示または非表示にします。\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help 固定 - カーソル位置の拡大表示を\n固定/固定解除します。\n Hide/Show grid Magnify-Main グリッドの表示 / 非表示 magnify: size must be a multiple of 4\n Console 拡大鏡: サイズは 4 の倍数でなければなりません\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help 一般:\n 32 x 32 – 左上の数値は見えているピクセルの数です。\n(幅 x 高さ)\n 8 ピクセル/ピクセル – 1つのピクセルを拡大するのに\n使用する ピクセル数を示します。\n R:152 G:52 B:10 – 赤い四角のところにあるピクセルの\n RGB 値です。\n -Help Magnify-Main ヘルプ -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help サイズ変更:\n 正方形にする - 幅と高さのうち大きい方の値を設定して\n 正方形の画像を作成します。\n ウィンドウサイズを大きく/小さくする - 4ピクセル刻みでウィンドウ\n サイズを増減させます。\n - 補足: ウィンドウ部分のサイズを変更することでこのウィンドウのサイズを\n 任意の大きさに変更することもできます。\n ピクセルサイズを増やす/減らす - '実際の' 1ピクセルを何ピクセルで拡大表示するのか、そのピクセル数を\n増やす、または減らします。範囲は1から16までです。\n Decrease pixel size Magnify-Main ピクセルサイズを小さく Magnify System name 拡大鏡 %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize ピクセル/ピクセル Info Magnify-Main 情報 Remove a crosshair Magnify-Main 十字カーソルを削除 Freeze/Unfreeze image Magnify-Main イメージを固定 / 固定解除 -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help コピー/保存:\n コピー - 現在の画像をクリップボードに保存します\n 保存 - 保存先のファイルダイアログを出して\n 画像のビット列を書き込みます\n Hide/Show info Magnify-Main 情報の表示 / 非表示 -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help ナビゲーション:\n 矢印キー - 現在の選択部 (rgb インジケーターまたは十字カーソル)\n を一度に 1 ピクセル移動します\n オプション + 矢印キー - マウスの位置を一度に 1 ピクセル移動します\n x は選択部にマークします - 現在の選択部には 'x' がつきます\n Save image Magnify-Main イメージの保存 Increase window size Magnify-Main ウィンドウを大きく Decrease window size Magnify-Main ウィンドウを小さく diff --git a/data/catalogs/apps/magnify/lt.catkeys b/data/catalogs/apps/magnify/lt.catkeys index d9325fe4a1..b0b4314a9d 100644 --- a/data/catalogs/apps/magnify/lt.catkeys +++ b/data/catalogs/apps/magnify/lt.catkeys @@ -1,26 +1,18 @@ -1 lithuanian x-vnd.Haiku-Magnify 283320408 +1 lithuanian x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image iškarpinė tuščia\n Make square Magnify-Main Transformuoti į kvadratą Copy image Magnify-Main Kopijuoti paveikslą -Magnify help Magnify-Help Didintuvo atmintinė usage: magnify [size] (magnify size * size pixels)\n Console Naudojimas: magnify [dydis]\n Stick coordinates Magnify-Main Fiksuoti koordinates -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Informacija:\nRodyti / slėpti informaciją – parodo arba paslepia visas šias naujas ypatybes\npastaba: kai informacija rodoma, padidintame vaizde atsiranda raudonas\nkvadratas, nurodantis, kurio taško RŽM reikšmės rodomos\nPridėti / pašalinti kryžmę – padidintame vaizde galima papildomai pridėti\nir pašalinti iki dviejų kryžmių, padedančių lygiuoti objektus\nKryžmės yra vaizduojamos kaip mėlyni kvadratai su iš jų einančiomis\nmėlynomis linijomis.\nRodyti / slėpti tinklelį – įjungia arba išjungia tinklelį, skiriantį visus taškus\nvieną nuo kito\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help Užfiksuoti / atlaisvinti vaizdą – užfiksuoja didintuve rodomą\nvaizdą arba panaikina šį fiksavimą\n Hide/Show grid Magnify-Main Rodyti / slėpti tinklelį magnify: size must be a multiple of 4\n Console didintuvas: dydis turi būti skaičiaus 4 kartotinis\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Bendra informacija:\n32×32 – viršuje, kairėje esantys skaičiai nurodo, matomą\npadidintų taškų skaičių (plotis × aukštis)\nmastelis 8:1 – nurodo, kiek kartų padidinamas vaizdas.\nR:152 Ž:52 M:10 – raudonai apibraukto taško spalva\n(aprašyta raudonos, žalios ir mėlynos spalvos intensyvumu)\n -Help Magnify-Main Žinynas -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Dydis ir mastelis:\nTransformuoti į kvadratą – sulygina padidinto vaizdo aukštį ir\nplotį, iki didesniosios iš šių reikšmių\nPadidinti / sumažinti langą – keičia lango dydį 4 padidintais taškais\npastaba: lango dydį taip pat galite keisti įprastu būdu – traukdami\napatinį dešinįjį lango kampą\nPadidinti / sumažinti mastelį – keičia taško didinimo koeficientą.\nŠis koeficientas gali būti nuo 1 iki 16.\n Decrease pixel size Magnify-Main Sumažinti mastelį Magnify System name Didintuvas %width x %height @ %pixelSize pixels/pixel Magnify-Main %width×%height, mastelis %pixelSize:1 Info Magnify-Main Informacija Remove a crosshair Magnify-Main Pašalinti kryžmę Freeze/Unfreeze image Magnify-Main Užfiksuoti / atlaisvinti vaizdą -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Vaizdo kopijavimas ir įrašymas:\nKopijuoti – nukopijuos rodomą vaizdą į iškarpinę\nĮrašyti – paklaus failo vardo ir tą failą įrašys paveikslėlį\n Hide/Show info Magnify-Main Rodyti / slėpti informaciją -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navigavimas:\nrodyklių klavišais galite perkelti pažymėtą priemonę (spalvos\nindikatorių arba kryžmę) per vieną tašką. Pažymėtąją priemonę\nindikuoja kvadrate esantis kryžiukas (x)\noption+rodyklių klavišų kombinacija galite per vieną tašką perkelti\npelės žymeklį\n Save image Magnify-Main Įrašyti paveikslą Increase window size Magnify-Main Padidinti langą Decrease window size Magnify-Main Sumažinti langą diff --git a/data/catalogs/apps/magnify/nl.catkeys b/data/catalogs/apps/magnify/nl.catkeys index 17d0646cf0..1712d10df6 100644 --- a/data/catalogs/apps/magnify/nl.catkeys +++ b/data/catalogs/apps/magnify/nl.catkeys @@ -1,26 +1,18 @@ -1 dutch; flemish x-vnd.Haiku-Magnify 283320408 +1 dutch; flemish x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image geen clip msg\n Make square Magnify-Main Vierkant maken Copy image Magnify-Main Afbeelding kopiëren -Magnify help Magnify-Help Magnify help usage: magnify [size] (magnify size * size pixels)\n Console gebruik: magnify [grootte] (vergroot grootte * grootte pixels)\n Stick coordinates Magnify-Main Coördinaten vasthouden -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Info:\n verbergen/tonen info - verbergt/toont al deze nieuwe kenmerken\n opmerking: in 'tonen'-modus zal er een rood vierkant zichtbaar zijn dat aangeeft van welke pixel de rgb-waarden aangeduid worden\n toevoegen/verwijderen draadkruizen - 2 draadkruizen kunnen worden toegevoegd (of verwijderd)\n om te helpen bij de uitlijning en plaatsing van objecten.\n De draadkruizen worden weergegeven door blauwe vierkanten en blauwe lijnen.\n verbergen/tonen raster - verbergt/toont het raster dat pixels van elkaar scheidt. - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help bevriezen - bevriest/ontvriest de vergroting of waar de\ncursor zich momenteel boven bevindt\n Hide/Show grid Magnify-Main Raster verbergen/tonen magnify: size must be a multiple of 4\n Console vergroten: grootte moet een veelvoud van 4 zijn\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Algemeen:\n 32 x 32 - de nummers linksboven geven het aantal zichtbare\n pixels weer (breedte x hoogte)\n 8 pixels/pixel - geeft het aantal pixels aan dat\n gebruikt wordt om een pixel te vergroten\n R:152 G:52 B:10 - de RGB-waarden voor de pixel onder\n het rode vierkant\n -Help Magnify-Main Help -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Vormen/omvormen:\n vierkant maken - stelt de breedte en de hoogte in\n naar de langste van die twee om er\n een vierkant beeld mee te maken.\n toenemen/afnemen venstergrootte - laat het venstergrootte\n toenemen of afnemen met 4 pixels.\n toenemen/afnemen pixelgrootte - laat het aantal\n pixels dat gebruikt wordt om een 'echte' pixel te vergroten, toenemen of afnemen. Begrensd tussen 1 en 16.\n Decrease pixel size Magnify-Main Pixelgrootte verkleinen Magnify System name Magnify %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pixels/pixel Info Magnify-Main Info Remove a crosshair Magnify-Main Een dradenkruis verwijderen Freeze/Unfreeze image Magnify-Main Beeld vastzetten/loszetten -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Kopiëren/opslaan:\n kopiëren - kopieert het huidige beeld naar het klembord\n opslaan - vraagt de gebruiker naar een bestand om in te bewaren en produceert\n de databits van de afbeelding\n Hide/Show info Magnify-Main Info verbergen/tonen -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navigatie:\n pijltoetsen - verplaats de huidige selectie (rgb indicatie of draadkruis)\n met 1 pixel per keer\n option-pijltoets - verplaatst de muislocatie 1 pixel per keer\n selectiemarkering met x - de huidige selectie bevat een 'x'\n Save image Magnify-Main Afbeelding opslaan Increase window size Magnify-Main Venster vergroten Decrease window size Magnify-Main Venster verkleinen diff --git a/data/catalogs/apps/magnify/pl.catkeys b/data/catalogs/apps/magnify/pl.catkeys index ba535e36eb..196bd055fb 100644 --- a/data/catalogs/apps/magnify/pl.catkeys +++ b/data/catalogs/apps/magnify/pl.catkeys @@ -1,26 +1,18 @@ -1 polish x-vnd.Haiku-Magnify 283320408 +1 polish x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image no clip msg\n Make square Magnify-Main Zrób kwadrat Copy image Magnify-Main Kopiuj obraz -Magnify help Magnify-Help Pomoc usage: magnify [size] (magnify size * size pixels)\n Console użycie: magnify [rozmiar] (rozmiar powiększenia * rozmiar piksela)\n Stick coordinates Magnify-Main Zablokuj współrzędne -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Informacje:\n ukryj/pokaż informacje - ukrywa/pokazuje te wszystkie nowe funkcje\n uwaga: podczas pokazywania pojawi się czerwony kwadracik,\n który wskazuje na piksel, którego kolor RGB zostanie pokazany\n dodaj/usuń celowniki - 2 celowniki mogą zostać dodane (lub\n usunięte), żeby pomóc w wyrównaniu i położeniu obiektów.\n Celowniki pokazują się jako niebieskie kwadraciki i niebieskie linie.\n ukryj/pokaż siatkę - ukrywa/pokazuje siatkę, która oddziela\n każdy piksel\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help zamrażanie - zamraża/odmraża powiększenie tego co\nnad czym jest aktualnie kursor\n Hide/Show grid Magnify-Main Ukryj/Pokaż siatkę magnify: size must be a multiple of 4\n Console magnify: rozmiar musi być wielokrotnością liczby 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Ogólne informacje:\n 32 x 32 - liczba w lewym górnym rogu to liczba\n pikseli (szerokość x wysokość)\n 8 pikseli/piksel - reprezentuje liczbę pikseli, które są używane\n do powiększenia jednego piksela\n R:152 G:52 B:10 - wartość koloru RGB piksela\n pod czerwonym kwadracikiem\n -Help Magnify-Main Pomoc -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Rozmiar:\n zrób kwadrat - zwiększa szerokość lub wysokość tak,\n aby powiększenie było kwadratowe\n powiększ/zmniejsz rozmiar okna - zwiększa lub zmniejsza rozmiar\n okna o 4 piksele.\n uwaga: rozmiar okna można oczywiście zmienić również\n przez przeciąganie obszaru w prawym dolnym rogu okna\n powiększ/zmniejsz rozmiar piksela - zwiększa lub zmniejsza liczbę\n pikseli użytych do wyświetlenia "prawdziwego" piksela.\n Zakres to od 1 do 16.\n Decrease pixel size Magnify-Main Zmniejsz rozmiar piksela Magnify System name Magnify %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pikseli/piksel Info Magnify-Main Informacje Remove a crosshair Magnify-Main Usuń celownik Freeze/Unfreeze image Magnify-Main Zamroź/odmroź obraz -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Kopiuj/Zapisz:\n kopiuj - kopiuje obecny obraz do schowka\n zapisz - pokazuje okno zapisu pliku, zawierającego \n obecny obraz\n Hide/Show info Magnify-Main Ukryj/Pokaż informacje -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Nawigacja:\n klawisze strzałek - przesuwają obecne zaznaczenie (wskaźnik RGB\n lub celownik) o około 1 piksel na raz\n klawisz opcji (zazwyczaj Super lub prawy alt)+strzałka - przesuwa\n kursor myszy o 1 piksel\n x oznacza wybrów - obecnie wybrany wskaźnik/celownik ma w środku 'x'\n Save image Magnify-Main Zapisz obraz Increase window size Magnify-Main Powiększ rozmiar okna Decrease window size Magnify-Main Zmniejsz rozmiar okna diff --git a/data/catalogs/apps/magnify/pt_BR.catkeys b/data/catalogs/apps/magnify/pt_BR.catkeys index 92818ecab7..88c9d158d0 100644 --- a/data/catalogs/apps/magnify/pt_BR.catkeys +++ b/data/catalogs/apps/magnify/pt_BR.catkeys @@ -1,26 +1,18 @@ -1 portuguese (brazil) x-vnd.Haiku-Magnify 283320408 +1 portuguese (brazil) x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image nenhuma mensagem do clipboard\n Make square Magnify-Main Criar quadrado Copy image Magnify-Main Copiar imagem -Magnify help Magnify-Help Ajuda do Ampliar usage: magnify [size] (magnify size * size pixels)\n Console utilização: magnify [tamanho] (tamanho da ampliação * tamanho em pixels)\n Stick coordinates Magnify-Main Coordenadas do ponto de fixação -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Informações:\nocultar/exibir informações - oculta/exibe todas estas novas funcionalidades\nnota: quando exibindo, um quadrado vermelho irá aparecer, o que significa\nque os valores rgb do pixel serão mostrados\nadicionar/remover mira - duas miras podem ser adicionadas (ou removidas)\npara auxiliar no alinhamento e posicionamento de objetos.\nAs miras são representadas por quadrados e linhas azuis.\nocultar/exibir grade - oculta/exibe a grade que separa cada pixel\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help congelar - congela/descongela ampliação do que quer que seja que o cursor esteja focalizando no momento\n Hide/Show grid Magnify-Main Ocultar/Exibir grade magnify: size must be a multiple of 4\n Console ampliar: tamanho deve ser um múltiplo de 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help 32 x 32 - os números no topo à esquerda são o número de pixels\nvisíveis (largura x altura)\n8 pixels/pixel - representa o número de pixels que são\nusados para ampliar um pixel\nR:152 G:52 B:10 - o valor RGB para um pixel sob\no quadrado vermelho\n -Help Magnify-Main Ajuda -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Dimensionamento/Redimensionamento:\nformar quadrado - define a largura e a altura para o mais largo\nde dois quadrados formando uma imagem quadrada\naumentar/diminuir tamanho da janela - cresce ou reduz o tamanho da janela em 4 pixels.\nnota: a janela pode ser também redimensionada para qualquer tamanho através da\nregião de redimensionamento da janela\naumentar/diminuir tamanho do pixel - aumenta ou diminui o número\nde pixels utilizados para ampliar um pixel 'real'. A variação vai de 1 a 16.\n Decrease pixel size Magnify-Main Diminuir tamanho do pixel Magnify System name Ampliar %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pixels/pixel Info Magnify-Main Informações Remove a crosshair Magnify-Main Remover uma mira Freeze/Unfreeze image Magnify-Main Congelar/Descongelar imagem -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Copiar/Salvar:\ncopiar - copia a imagem atual para a área de transferência\nsalvar - avisa o usuário para salvar um arquivo e grava os bits da imagem\n Hide/Show info Magnify-Main Ocultar/Exibir informações -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navegação:\nteclas de seta - move a seleção atual (indicador rgb ou mira)\nem torno de 1 pixel de cada vez\nalt-tecla de seta - move a localização do mouse 1 pixel de cada vez\nx marca a seleção - a seleção atual tem um 'x' nela\n Save image Magnify-Main Salvar imagem Increase window size Magnify-Main Aumentar o tamanho da janela Decrease window size Magnify-Main Diminuir o tamanho da janela diff --git a/data/catalogs/apps/magnify/ro.catkeys b/data/catalogs/apps/magnify/ro.catkeys index fed82466f6..6668fafe11 100644 --- a/data/catalogs/apps/magnify/ro.catkeys +++ b/data/catalogs/apps/magnify/ro.catkeys @@ -1,25 +1,18 @@ -1 romanian x-vnd.Haiku-Magnify 2227745383 +1 romanian x-vnd.Haiku-Magnify 3914403817 no clip msg\n In console, when clipboard is empty after clicking Copy image niciun clip msg\n Make square Magnify-Main Alcătuiește pătrat Copy image Magnify-Main Copiază imagine -Magnify help Magnify-Help Ajutor lupă usage: magnify [size] (magnify size * size pixels)\n Console utilizare: Stick coordinates Magnify-Main Lipește coordonate -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Info:\n ascunde/afișează info - ascunde/afișează toate caracteristicile noi\n notă: la afișare, un pătrat roșu va apărea ceea ce semnifică\nvalorile rgb ale pixelului care vor fi afișate\n adaugă/elimină încrucișări - 2 încrucișări pot fi adăugate (sau eliminate)\n pentru a ajuta în alinierea și plasarea obiectelor.\nÎncrucișările sunt reprezentate de pătrate și linii albastre.\n ascunde/afișează grila - ascunde/afișează grila care separă fiecare pixel\n Hide/Show grid Magnify-Main Ascunde/Afișează grilă magnify: size must be a multiple of 4\n Console lupă: dimensiunea trebuie să fie multiplu de 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help General:\n 32 x 32 - numerele din stânga sus sunt numărul de pixeli\nvizibili (lățime x înălțime) 8 pixeli/pixel - reprezintă numărul de pixeli care sunt utilizați\n pentru a mări un pixel\n R:152 G:52 B:10 - valorile RGB pentru pixelul de sub\n pătratul roșu\n -Help Magnify-Main Ajutor -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Dimensionare/Redimensionare:\nalcătuiește pătrat - configură lățimea și înălțimea la cea mai largă\n dintre ele alcătuind o imagine pătrată\n mărește/micșorează dimensiunea ferestrei - mărește sau micșorează dimensiunea\nferestrei cu 4 pixeli.\nnotă: această fereastră poate fi de asemenea redimensionată la orice mărime prin regiunea\nde redimensionare a ferestrei\nmărește/micșorează dimensiunea pixelului - mărește sau micșorează numărul\ndepixeli utilizați pentru a mări un pixel „real”. Intervalul este de la 1 la 16.\n Decrease pixel size Magnify-Main Micșorează dimensiune pixel Magnify System name Lupă %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pixels/pixel Info Magnify-Main Info Remove a crosshair Magnify-Main Elimină un reticul Freeze/Unfreeze image Magnify-Main Îngheață/Dezgheață imagine -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Copiază/Salvează:\n copiază - copiază imaginea curentă la clipboard\n salvează - anunță utilizatorul pentru salvarea unui fișier și scrie\nbiții imaginii\n Hide/Show info Magnify-Main Ascunde/Afișează info -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navigare:\ntaste cu săgeți - mută selecția curentă (indicator rgb sau reticul)\n în jur de 1 pixel o dată\n opțiune-tastă cu săgeată - mută locația mausului cu 1 pixel o dată\n x marchează selecția - selecția curentă conține un „x”\n Save image Magnify-Main Salvează imagine Increase window size Magnify-Main Mărește dimensiune fereastră Decrease window size Magnify-Main Micșorează dimensiune fereastră diff --git a/data/catalogs/apps/magnify/ru.catkeys b/data/catalogs/apps/magnify/ru.catkeys index 77915bc725..960b46e263 100644 --- a/data/catalogs/apps/magnify/ru.catkeys +++ b/data/catalogs/apps/magnify/ru.catkeys @@ -1,26 +1,18 @@ -1 russian x-vnd.Haiku-Magnify 283320408 +1 russian x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image буфер обмена пуст\n Make square Magnify-Main Сделать квадрат Copy image Magnify-Main Копировать изображение -Magnify help Magnify-Help Справка по увеличителю usage: magnify [size] (magnify size * size pixels)\n Console использование: magnify [размер] (размер увеличителя * размер пикселей)\n Stick coordinates Magnify-Main Зафиксировать координаты -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Информация:\n скрыть/показать информацию - скрывает/показывает все эти новые функции\n примечание: при отображении, появится красная клетка\n которая означает какие rgb значения пикселя будут отображены\n добавить/удалить перекрестье - 2 перекрестья могут быть добавлены (или удалены)\n для того, чтобы помочь выровнять местоположение объектов.\n Перекрестье отображается в виде синей клетки и синих линий.\n скрыть/показать стеку - скрывает/показывает сетку, которая разделяет каждый пиксель\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help заморозить - замораживает/размораживает увеличение того места,\n над чем в данный момент находится курсор\n Hide/Show grid Magnify-Main Скрыть/показать сетку magnify: size must be a multiple of 4\n Console увеличитель: размер должен кратным 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Основное:\n 32 x 32 - числа в верхнем левом углу отображают\n число видимых пикселей (ширина x высота)\n 8 пикселей на пиксель - отображает число\n пикселей используемых для увеличения пикселя\n R:152 G:52 B:10 - значения RGB для \n пикселя под красной клеткой\n -Help Magnify-Main Помощь -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Масштаб/изменение размера:\n в виде квадрата - делает ширину или высоту окна равной стороне,\n наибольшей из двух, создавая квадрат\n увеличить/уменьшить размер окна - увеличивает или уменьшает размер окна\n на 4 пикселя.\n примечание: размер этого окна можно делать любым с помощью\n края масштабирования окна\n увеличить/уменьшить размер пикселя - увеличит или уменьшить количество пикселей\n используемых для увеличения 'настоящего' пикселя. Диапазон от 1 до 16.\n Decrease pixel size Magnify-Main Уменьшить размер пикселя Magnify System name Увеличитель %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize пикселей на пиксель Info Magnify-Main Информация Remove a crosshair Magnify-Main Удалить перекрестье Freeze/Unfreeze image Magnify-Main Заморозить/разморозить изображение -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Копировать/Cохранить:\n копировать - копирует видимое изображение в буфер обмена\n сохранить - спрашивает пользователя в какой файл сохранить\n текущее изображение\n Hide/Show info Magnify-Main Скрыть/показать информацию -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Навигация:\n стрелки - перемещают текущее выделение (rgb индикатор или перекрестье)\n на 1 пиксель за раз\n option+стрелки - перемещают расположение на 1 пиксель за раз\n x отмечает текущее выделение - текущее выделение отмечен внутри буквой 'x'\n Save image Magnify-Main Сохранить изображение Increase window size Magnify-Main Увеличить размер окна Decrease window size Magnify-Main Уменьшить размер окна diff --git a/data/catalogs/apps/magnify/sk.catkeys b/data/catalogs/apps/magnify/sk.catkeys index 5d887f3176..20095e421e 100644 --- a/data/catalogs/apps/magnify/sk.catkeys +++ b/data/catalogs/apps/magnify/sk.catkeys @@ -1,26 +1,18 @@ -1 slovak x-vnd.Haiku-Magnify 283320408 +1 slovak x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image správa prázdna schránka\n Make square Magnify-Main Urobiť štvorec Copy image Magnify-Main Kopírovať obrázok -Magnify help Magnify-Help Pomoc k Lupe usage: magnify [size] (magnify size * size pixels)\n Console použitie: magnify [veľkosť] (veľkosť zväčšenia * veľkosť pixlov)\n Stick coordinates Magnify-Main Prilepiť súradnice -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Info:\n info skryť/zobraziť - skryje/zobrazí všetky tieto nové vlastnosti\n pozn.: pri zobrazovaní sa objaví červený štvorček označujúci\n ktorého pixla hodnoty RGB sa zobrazia\n pridať/skryť mušku - je možné pridať (alebo odstrániť) dve mušky,\n ktoré môžu pomôcť pri zarovnaní a umiestňovaní objektov.\n Mušky predstavujú modré štvorčeky a modré čiary.\n skryť/zobraziť mriežku - skryje/zobrazí mriežku oddeľujúcu jednotlivé pixle\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help freeze - zmrazí/rozmrazí zväčšenie čohokoľvek\n nad čím sa práve nachádza kurzor\n Hide/Show grid Magnify-Main Skryť/zobraziť mriežku magnify: size must be a multiple of 4\n Console lupa: veľkosť musí byť násobok 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Všeobecné:\n 32 x 32 - čísla vľavo hore sú počet viditeľných\n pixlov (šírka x výška)\n 8 pixlov/pixel - predstavuje počet pixlov, ktoré sa\n používajú na zväčšenie pixla\n R:152 G:52 B:10 - hodnoty RGB pixla pod\n červeným štvorcom\n -Help Magnify-Main Pomoc -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Zmena veľkosti:\n urobiť štvorec - nastaví šírku a výšku na väčšiu z týchto\n hodnôt, čím vytvorí štvorcový obraz\n zväčšiť/zmenšiť veľkosť okna - zväčší alebo zmenší veľkosť\n okna po 4 pixloch.\n pozn.: veľkosť tohto okna tiež možno zmeniť na ľubovoľnú veľkosť \n zmenou veľkosti okna\n zväčšiť/zmenšiť veľkosť pixla - zväčší alebo zmenší počet pixlov\n použitých na zväčšenie „skutočného“ pixla. Rozsah je od 1 do 16.\n Decrease pixel size Magnify-Main Zmenšiť veľkosť pixla Magnify System name Lupa %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pixlov/pixel Info Magnify-Main Info Remove a crosshair Magnify-Main Odstrániť mušku Freeze/Unfreeze image Magnify-Main Zmraziť/rozmraziť obraz -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Kopírovať/Uložiť:\n kopírovať - skopíruje aktuálny obraz do schránky\n uložiť - vyzve používateľa, aby zadal súbor, kam sa majú uložiť\n bity obrázka a zapíše ho\n Hide/Show info Magnify-Main Skryť/zobraziť info -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navigácia:\n klávesy šípok - presunúť aktuálny výber (indikátor RGB alebo mušku)\n o 1 pixel naraz\n option-kláves šípky - presunie umiestnenie myši o 1 pixel naraz\n x označuje výber - aktuálny výber má v sebe „x“\n Save image Magnify-Main Uložiť obrázok Increase window size Magnify-Main Zväčšiť veľkosť okna Decrease window size Magnify-Main Zmenšiť veľkosť okna diff --git a/data/catalogs/apps/magnify/sv.catkeys b/data/catalogs/apps/magnify/sv.catkeys index dcbb7abb00..dfa99c8e3b 100644 --- a/data/catalogs/apps/magnify/sv.catkeys +++ b/data/catalogs/apps/magnify/sv.catkeys @@ -1,26 +1,18 @@ -1 swedish x-vnd.Haiku-Magnify 283320408 +1 swedish x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image inga urklipp\n Make square Magnify-Main Skapa rektangel Copy image Magnify-Main Kopiera bild -Magnify help Magnify-Help Förstoraren hjälp usage: magnify [size] (magnify size * size pixels)\n Console användning: magnify [storlek] (förstorningsstorlek * storlek i pixlar)\n Stick coordinates Magnify-Main Lås koordinater -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Info:\n göm/visa info - gömmer/visar de här funktionerna\n Notera att den röda punkten anger vilken pixel's rgb-värde som visas.\n lägg visa/göm korshår - 2 korshår can be läggas till (och tas bort)\n för att hjälpa till med uppradning och placering av objekt.\n Korshåren representeras av blå fyrkanter blå linjer.\n visa/göm rutnät - visar/gömmer nätet som skiljer pixlarna åt.\n - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help frys - frys/rör av det som syns i förstoringen\n Hide/Show grid Magnify-Main Göm/visa rutmönster magnify: size must be a multiple of 4\n Console förstoraren: storleken måste vara en multipel av 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Allmänt:\n 32 x 32 - numret upp till vänster anger antalet synliga pixlar (bredd x höjd)\n 8 pixlar/pixel - anger antalet pixlar som\n används för att förstora en pixell\n R:152 G:52 B:10 - RGB värden för pixeln under\n den röda fyrkanten\n -Help Magnify-Main Hjälp -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Storlek/Storleksändring:\n gör liksidig - sätter bredden och höjden till den större\n av de två, så att det blir en fyrkant\n öka/minska fönsterstorlek - ökar eller minskar fönstrets storlek\n med 4 pixlar.\n notera: fönstrets storlek kan också ändras till valfri storlek via dragfunktionen nere i hörnet.\n öka/minska pixelstorlek - ökar och minskar antalet\n pixlar som används för att visa en 'riktig' pixel. Från 1 till 16.\n Decrease pixel size Magnify-Main Minska pixelstorlek Magnify System name FörstoringsGlas %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pixlar/pixel Info Magnify-Main Information Remove a crosshair Magnify-Main Ta bort korshår Freeze/Unfreeze image Magnify-Main Frys/avfrys bild -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Kopiera/spara:\nkopiera - kopierar den nuvarande bilden till urklipp\nspara - frågar användaren vart den vill spara filen\n Hide/Show info Magnify-Main Göm/visa info -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Navigering:\npiltangenter - flytta markeringen (RGB indikatorn eller korshåret)\n en pixel åt gången\nalt+piltangent - flyttar muspekaren 1 pixel åt gången\nx markering - markeren har ett x\n Save image Magnify-Main Spara bild Increase window size Magnify-Main Öka fönsterstorlek Decrease window size Magnify-Main Minska fönsterstorlek diff --git a/data/catalogs/apps/magnify/uk.catkeys b/data/catalogs/apps/magnify/uk.catkeys index 264e0e74a3..13fddb7b79 100644 --- a/data/catalogs/apps/magnify/uk.catkeys +++ b/data/catalogs/apps/magnify/uk.catkeys @@ -1,25 +1,18 @@ -1 ukrainian x-vnd.Haiku-Magnify 2227745383 +1 ukrainian x-vnd.Haiku-Magnify 3914403817 no clip msg\n In console, when clipboard is empty after clicking Copy image немає кліпу msg\n Make square Magnify-Main Задати площу Copy image Magnify-Main Копіювати зображення -Magnify help Magnify-Help Допомога Magnify usage: magnify [size] (magnify size * size pixels)\n Console Використання: Stick coordinates Magnify-Main Вісь кординат -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Інформація:\n hide/show info - сховати/показати всі нові можливості\n заувага: при показі, з'явиться червона площа яка означає\n скільки пікселів rgb буде показано\n add/remove crosshairs - 2 перехрестя може бути додано (або знято)\n для надання допомоги у вирівнюванні чи розташуванні об'єктів .\n Перехрестки позначені синіми квадратами і лініями.\n hide/show grid - приховати/показати сітку, яка відокремлює кожен піксель\n Hide/Show grid Magnify-Main приховати/показати сітку magnify: size must be a multiple of 4\n Console збільшення: Розмір має бути кратним 4\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Основне:\n 32 x 32 - Верхнє ліве число кількість видимих\n пікселів (ширина x висота)\n 8 pixels/pixel - являє собою кількість пікселів які\n використовуются для збільшення пікселів\n R:152 G:52 B:10 - Значення RGB для пікселів під\n червоною площею\n -Help Magnify-Main Допомога -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Sizing/Resizing:\nзадає площу- виставляє висоту і ширину більш\n ніж двох площ зображень\n increase/decrease window size - звужує розширює вікно\n розміром 4 пікселі.\n заувага: це вікно може також бути змінене до іншого \n зміною його меж\n increase/decrease pixel size - змінює число\n пікселів, що використовуються для збільшення реального пікселя. Діапазон від 1 до 16.\n Decrease pixel size Magnify-Main Зменшити розмір пікселів Magnify System name Збільшення %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pixels/pixel Info Magnify-Main Інформація Remove a crosshair Magnify-Main Зняти перехрестя Freeze/Unfreeze image Magnify-Main заморозити/відморозити зображення -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help Копіювати/зберегти:\n copy - копіює поточне зображення в буфер обміну\n save - запитує у користувача файл який потрібно зберегти і записує його\n біти зображення\n Hide/Show info Magnify-Main приховати/показати Інформацію -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Навігація:\n стрілочки - переміщують курсор вибору (rgb індикатора або перехрестя)\n довкола 1 пікселя за раз\n опція стрілочки - переміщає курсор 1 піксель за раз\n x зробіть вибір - поточний вибір має 'x' в собі\n Save image Magnify-Main Зберегти зображення Increase window size Magnify-Main Збільшити розмір вікна Decrease window size Magnify-Main Зменшити розмір вікна diff --git a/data/catalogs/apps/magnify/zh_Hans.catkeys b/data/catalogs/apps/magnify/zh_Hans.catkeys index de7dc8bd1c..af7512e490 100644 --- a/data/catalogs/apps/magnify/zh_Hans.catkeys +++ b/data/catalogs/apps/magnify/zh_Hans.catkeys @@ -1,26 +1,18 @@ -1 english x-vnd.Haiku-Magnify 283320408 +1 english x-vnd.Haiku-Magnify 907580139 no clip msg\n In console, when clipboard is empty after clicking Copy image 无修剪消息\n Make square Magnify-Main 创建方形 Copy image Magnify-Main 复制图像 -Magnify help Magnify-Help 放大帮助 usage: magnify [size] (magnify size * size pixels)\n Console 用法：magnify [size]（如，放大 size * size 像素）\n Stick coordinates Magnify-Main 插入坐标 -Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help 信息:\n 隐藏/显示信息 - 隐藏/显示 所有新功能\n 注意：当显示，红色方形反映出\n 显示其中像素的RGB值将\n 添加/删除十字光标- 可以添加（或删除)2十字光标\n 以帮助路线和安置对象。\n 十字光标为代表的蓝色方块和蓝线。\n 隐藏/显示网格- 隐藏/显示像素分隔的网格。 - freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help freeze - 冻结/解冻当前鼠标聚焦内容的放大倍率\n Hide/Show grid Magnify-Main 隐藏/显示栅格 magnify: size must be a multiple of 4\n Console 放大：尺寸必须为 4 的倍数。\n -General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help 常用：\n 32 x 32 - 左上数字为可见像素的数量（宽 x 高）\n 8 pixels/pixel - 代表用于放大单个像素的像素数量\n R:152 G:52 B:10 - 红色方块之下的像素的 RGB 值。 -Help Magnify-Main 帮助 -Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help 缩放：\n make square - 设置长宽为两者中较大的以创建方形图像\n 缩放窗口尺寸 - 增大或者缩小窗口 4 个像素。\n 注意：该窗口可以通过拖动区域为任何尺寸\n 缩放像素尺寸 - 增加或者缩小用于放大 ‘真正’ 像素的像素数量，从 1 至 16。\n Decrease pixel size Magnify-Main 缩小像素尺寸 Magnify System name 放大镜 %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pixels/pixel Info Magnify-Main 信息 Remove a crosshair Magnify-Main 删除十字光标 Freeze/Unfreeze image Magnify-Main 冻结/解冻 图像 -Copy/Save:\n copy - copies the current image to the clipboard\n save - prompts the user for a file to save to and writes out\n the bits of the image\n Magnify-Help 复制/保存：\n复制 - 复制当前图像到剪贴板\n 保存 - 提示用于保存到的文件，并写入\n图像位图。 Hide/Show info Magnify-Main 隐藏/显示信息 -Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help 导航：\n箭头键 - 移动当前选中（颜色指示器或光标）\n每次一个像素\n option+箭头键 - 移动鼠标位置，每次一个像素\n x 标记选中 - 当前选中部分中显示 'x'\n Save image Magnify-Main 保存图像 Increase window size Magnify-Main 放大窗口尺寸 Decrease window size Magnify-Main 缩小窗口尺寸 diff --git a/data/catalogs/apps/mediaconverter/ja.catkeys b/data/catalogs/apps/mediaconverter/ja.catkeys index 0a102cfb34..da3397029e 100644 --- a/data/catalogs/apps/mediaconverter/ja.catkeys +++ b/data/catalogs/apps/mediaconverter/ja.catkeys @@ -29,9 +29,9 @@ Error writing audio frame %lld MediaConverter オーディオフレーム %lld Cancelling MediaConverter キャンセル中 %d byte MediaFileInfo %d バイト Error loading files MediaConverter ファイルのロード中にエラーが発生しました -Cancel MediaConverter キャンセル +Cancel MediaConverter 中止 None available Video codecs 利用できません -Conversion cancelled MediaConverter 変換はキャンセルされました +Conversion cancelled MediaConverter 変換は中止されました No file selected MediaConverter-FileInfo ファイルが選択されていません Select this folder MediaConverter このフォルダーを選択 Continue MediaConverter 続ける @@ -41,7 +41,7 @@ Video: MediaConverter-FileInfo ビデオ： %d bit MediaFileInfo %d ビット Error creating '%filename' MediaConverter '%filename' の作成中にエラーが発生しました Video quality not supported MediaConverter ビデオ品質はサポートされていません -Cancelling… MediaConverter キャンセル中… +Cancelling… MediaConverter 中止中… File details MediaConverter ファイルの詳細 Select MediaConverter 選択 Writing video track: %ld%% complete MediaConverter ビデオトラックの書き込み: %ld%% 完了 diff --git a/data/catalogs/apps/people/ja.catkeys b/data/catalogs/apps/people/ja.catkeys index 29584d9173..eeccf971e9 100644 --- a/data/catalogs/apps/people/ja.catkeys +++ b/data/catalogs/apps/people/ja.catkeys @@ -45,6 +45,6 @@ Contact information for a person. Long mimetype description 連絡先情報 Fax People ファックス Contact name People 担当者名 Cut People 切り取り -Cancel People キャンセル +Cancel People 中止 State People 都道府県 Copy People コピー diff --git a/data/catalogs/apps/terminal/be.catkeys b/data/catalogs/apps/terminal/be.catkeys index 500a649e71..a2df049b1d 100644 --- a/data/catalogs/apps/terminal/be.catkeys +++ b/data/catalogs/apps/terminal/be.catkeys @@ -1,4 +1,4 @@ -1 belarusian x-vnd.Haiku-Terminal 3561344903 +1 belarusian x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow Не знойдзена. Switch Terminals Terminal TermWindow Пераключыць Тэрміналы Change directory Terminal TermView Змяніць дырэкторыю @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Тэкст не знойдзены. Find… Terminal TermWindow Пошук… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Працэс \"%1\" яшчэ актыўны.\nКалі вы закрыеце Тэрмінал, працэс будзе забіты. Move here Terminal TermView Перамясціць сюды -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tРабочы каталог актыўнага працэсу\n\t\t\tў цякучай укладцы.Дадаткова можна ўказаць макісмальную колькасць кампанентаў пуці.\n\t\t\t Напрыклад, '%2d' - не больша за два кампаненты.\n\t%i\t-\tІндэкс вакна.\n\t%p\t-\tІмя актыўнага працэсу ў цякучай укладцы.\n\t%t\t-\tІмя цякучай укладкі.\n\t%%\t-\tСімвал '%'. Retro Terminal colors scheme Даўніна Error! Terminal getString Памылка! New tab Terminal TermWindow Новая ўкладка diff --git a/data/catalogs/apps/terminal/de.catkeys b/data/catalogs/apps/terminal/de.catkeys index ece3bd5f9e..d3ddb4fa66 100644 --- a/data/catalogs/apps/terminal/de.catkeys +++ b/data/catalogs/apps/terminal/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-Terminal 3561344903 +1 german x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow Nicht gefunden. Switch Terminals Terminal TermWindow Terminals wechseln Change directory Terminal TermView Zum Ordner wechseln @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Der Suchbegriff wurde nicht gefunden. Find… Terminal TermWindow Suchen... The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Der Prozess \"%1\" läuft noch.\nWird das Terminal geschlossen, wird auch dieser Prozess abgebrochen. Move here Terminal TermView Hierher verschieben -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tDas aktuelle Arbeitsverzeichnis des aktiven Prozesses\n\t\t\t in diesem Reiter. Optional kann die maximale Anzahl von Pfad-Komponenten\n\t\t\t angegeben werden, z.B. '%2d' für maximal zwei Komponenten.\n\t%i\t-\tDer Index des Fensters.\n\t%p\t-\tDer Titel dieses Reiters.\n\t%%\t-\tDas %-Zeichen. Retro Terminal colors scheme Retro Error! Terminal getString Fehler! New tab Terminal TermWindow Neuer Reiter diff --git a/data/catalogs/apps/terminal/el.catkeys b/data/catalogs/apps/terminal/el.catkeys index 727f85df7f..520c7565e2 100644 --- a/data/catalogs/apps/terminal/el.catkeys +++ b/data/catalogs/apps/terminal/el.catkeys @@ -1,4 +1,4 @@ -1 greek, modern (1453-) x-vnd.Haiku-Terminal 2672618809 +1 greek, modern (1453-) x-vnd.Haiku-Terminal 4173005440 Not found. Terminal TermWindow Δε βρέθηκε. Switch Terminals Terminal TermWindow Εναλλαγή Τερματικών Change directory Terminal TermView Αλλαγή καταλόγου @@ -53,7 +53,6 @@ Text not found. Terminal TermWindow Το κείμενο δεν βρέθηκε. Find… Terminal TermWindow Εύρεση... The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Η διεργασία \"%1\" ακόμη εκτελείται.\nΕαν κλείσετε τοτερματικό, η διεργασία θα τερματιστεί. Move here Terminal TermView Μετακίνηση εδώ -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tΟ τρέχων κατάλογος της ενεργού διεργασίας.\n\t\t\tΠροαιρετικά ο μέγιστος αριθμός στοιχείων της διαδρομής μπορεί να\n\t\t\tπροσδιοριστεί. Π.χ. '%2d' για το πολύ δύο τμήματα.\n\t%i\t-\tΟ κατάλογος περιεχομένων του παραθύρου.\n\t%p\t-\tΤο όνομα της ενεργού διεργασίας στην τρέχουσα καρτέλα..\n\t%t\t-\tΟ τίτλος της τρέχουσας καρτέλας.\t%%\t-\tΟ χαρακτήρας '%'. Error! Terminal getString Σφάλμα! New tab Terminal TermWindow Νέα καρτέλα The pattern specifying the tab titles. The following placeholders\ncan be used:\n Terminal AppearancePrefView Το σχέδιο που προσδιορίζει τους τρέχοντες τίτλους καρτέλας. Τα παρακάτω σύμβολα \nμπορούν να χρησιμοποιηθούν:\n diff --git a/data/catalogs/apps/terminal/fi.catkeys b/data/catalogs/apps/terminal/fi.catkeys index bef5051c40..8854ac9b93 100644 --- a/data/catalogs/apps/terminal/fi.catkeys +++ b/data/catalogs/apps/terminal/fi.catkeys @@ -1,4 +1,4 @@ -1 finnish x-vnd.Haiku-Terminal 3561344903 +1 finnish x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow Ei löytynyt. Switch Terminals Terminal TermWindow Vaihda pääteikkunoita Change directory Terminal TermView Vaihda hakemistoa @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Tekstiä ei löydy. Find… Terminal TermWindow Etsi... The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Prosessia ”%1” suoritetaan yhä.\nJos suljet Pääteikkunan, prosessi tapetaan. Move here Terminal TermView Siirrä tänne -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tKäynnissä olevan prosessin nykyinen työhakemisto\n\t\t\tnykyisessä välilehdessä. Valinnaisesti määriteltävien polkukomponenttien\n\t\t\tenimmäismäärä. Esim.: ’%2d’ kahdelle yleisimmälle komponentille.\n\t%i\t-\tIkkunan indeksi.\n\t%p\t-\tKäynnissä olevan prosessin nimi nykyisessä välilehdessä.\n\t%t\t-\tNykyisen välilehden otsikko.\n\t%%\t-\tMerkki ’%’. Retro Terminal colors scheme Retro Error! Terminal getString Virhe! New tab Terminal TermWindow Uusi välilehti diff --git a/data/catalogs/apps/terminal/fr.catkeys b/data/catalogs/apps/terminal/fr.catkeys index cca9c2cd11..3dd76ff91d 100644 --- a/data/catalogs/apps/terminal/fr.catkeys +++ b/data/catalogs/apps/terminal/fr.catkeys @@ -1,4 +1,4 @@ -1 french x-vnd.Haiku-Terminal 3561344903 +1 french x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow Non trouvé. Switch Terminals Terminal TermWindow Inverser les Terminaux Change directory Terminal TermView Changer de répertoire @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Texte non trouvé. Find… Terminal TermWindow Rechercher… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow L'application « %1 » fonctionne encore.\nSi vous fermez le Terminal, l'application sera interrompue. Move here Terminal TermView Déplacer ici -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tLe répertoire de travail courant du processus actif dans l'onglet\n\t\t\tcourant. Optionnellement, le nombre maximum d'élément peut-être\n\t\t\tspécifié. E.g. '%2d' pour au plus 2 éléments.\n\t%i\t-\tL'index de la fenêtre.\n\t%p\t-\tLe nom du processus actif dans l'onglet courant.\n\t%t\t-\tLe titre de l'onglet courant.\n\t%%\t-\tLe caractère '%'. Retro Terminal colors scheme Rétro Error! Terminal getString Erreur ! New tab Terminal TermWindow Nouvel onglet diff --git a/data/catalogs/apps/terminal/hu.catkeys b/data/catalogs/apps/terminal/hu.catkeys index 75c2afc60b..e5484440c5 100644 --- a/data/catalogs/apps/terminal/hu.catkeys +++ b/data/catalogs/apps/terminal/hu.catkeys @@ -1,4 +1,4 @@ -1 hungarian x-vnd.Haiku-Terminal 3561344903 +1 hungarian x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow Nem található. Switch Terminals Terminal TermWindow Terminálok közti váltás Change directory Terminal TermView Mappa váltása @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Nem található a szöveg. Find… Terminal TermWindow Keresés… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow A folyamat (%1) még fut.\nHa bezárja a Terminált, a folyamat megszakad. Move here Terminal TermView Mozgatás -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tAz a mappa amiben a jelenlegi fül az aktív folyamata\n\t\t\tfut épp.Meg lehet adni az elérési út\n\t\t\tkomponenseinek számát. Pl. '%2d' maximum két komponenshez.\n\t%i\t-\tAz ablak indexe.\n\t%p\t-\tA jelenlegi fülben futó folyamat neve.\n\t%t\t-\tA jelenlegi fül címe.\n\t%%\t-\tEgy '%' karakter. Retro Terminal colors scheme Retro Error! Terminal getString Hiba! New tab Terminal TermWindow Új lap diff --git a/data/catalogs/apps/terminal/ja.catkeys b/data/catalogs/apps/terminal/ja.catkeys index 76636bc56f..d8321ba01a 100644 --- a/data/catalogs/apps/terminal/ja.catkeys +++ b/data/catalogs/apps/terminal/ja.catkeys @@ -1,4 +1,4 @@ -1 japanese x-vnd.Haiku-Terminal 3561344903 +1 japanese x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow これ以上見つかりません。 Switch Terminals Terminal TermWindow ターミナルを切替える Change directory Terminal TermView ディレクトリを変更 @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow 検索テキストが見つかりません Find… Terminal TermWindow 検索… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow プロセス \"%1\" がまだ実行中です。\nTerminalを閉じると強制終了されます。 Move here Terminal TermView カレントディレクトリへ移動 -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\t現在のタブへの実行中プロセスのカレントワーキングディレクトリ\n\t\t\tの表示。オプションでパス要素の最大値を\n\t\t\t指定できます。 例. '%2d' 最大 2 要素。\n\t%i\t-\tThe index of the window.\n\t%p\t-\t実行中プロセス名の現在のタプへの表示。\n\t%t\t-\t現在のタブのタイトル。\n\t%%\t-\t文字 '%' 。 Retro Terminal colors scheme レトロ Error! Terminal getString エラー! New tab Terminal TermWindow 新しいタブ diff --git a/data/catalogs/apps/terminal/lt.catkeys b/data/catalogs/apps/terminal/lt.catkeys index 9d484e4cc7..a42362d852 100644 --- a/data/catalogs/apps/terminal/lt.catkeys +++ b/data/catalogs/apps/terminal/lt.catkeys @@ -1,4 +1,4 @@ -1 lithuanian x-vnd.Haiku-Terminal 2178478404 +1 lithuanian x-vnd.Haiku-Terminal 3678865035 Not found. Terminal TermWindow Nerasta. Switch Terminals Terminal TermWindow Pereiti į kitą terminalą Change directory Terminal TermView Keisti aplanką @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Ieškotas tekstas nerastas. Find… Terminal TermWindow Ieškoti… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Užduotis „%1“ dar vykdoma.\nUžvėrus langą, jos darbas bus nutrauktas. Move here Terminal TermView Perkelti čia -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tAktyvioje kortelėje vydomos aktyvios užduoties veikiamasis \t\t\taplankas. Taip pat galima nurodyti didžiausią kelio komponenčių\n\t\t\tskaičių. Pavyzdžiui, „%2d“ reikš ne daugiau kaip dvi komponentes.\n\t%i\t-\tLango eilės numeris.\n\t%p\t-\tAktyvioje kortelėje vykdomos aktyvios užduoties pavadinimas.\n\t%t\t-\tAktyvios kortelės antraštė.\n\t%%\t-\tSimbolis „%“. Retro Terminal colors scheme Retro Error! Terminal getString Klaida! New tab Terminal TermWindow Nauja kortelė diff --git a/data/catalogs/apps/terminal/nl.catkeys b/data/catalogs/apps/terminal/nl.catkeys index cb7fb562d4..d9f3df0cd4 100644 --- a/data/catalogs/apps/terminal/nl.catkeys +++ b/data/catalogs/apps/terminal/nl.catkeys @@ -1,4 +1,4 @@ -1 dutch; flemish x-vnd.Haiku-Terminal 2912171349 +1 dutch; flemish x-vnd.Haiku-Terminal 117590684 Not found. Terminal TermWindow Niet gevonden. Switch Terminals Terminal TermWindow Wissel van Terminal Change directory Terminal TermView Directory veranderen @@ -54,7 +54,6 @@ Text not found. Terminal TermWindow De tekst werd niet gevonden Find… Terminal TermWindow Zoeken... The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Het proces \"%1\" is nog gaande.\nAls u Terminal sluit, zal het proces afgebroken worden. Move here Terminal TermView Hierheen verplaatsen -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tDe huidige werkmap van het actieve proces in de \n\t\thuidige tab. Optioneel kan het maximale aantal padonderdelen\n\t\tworden opgegeven. Bijvoorbeeld '%2d' voor maximaal 2 onderdelen.\n\t%i\t-\tDe index van het venster.\n\t%p\t-\tDe naam van het actieve proces in de huidige tab.\n\t%t\t-\tDe titel van de huidige tab.\n\t%%\t-\tHet karakter '%'. Error! Terminal getString Fout! New tab Terminal TermWindow Nieuwe tab The pattern specifying the tab titles. The following placeholders\ncan be used:\n Terminal AppearancePrefView Het model dat de tabtitels bepaalt.\nDe volgende plaatsaanduidingen kunnen worden gebruikt:\n diff --git a/data/catalogs/apps/terminal/pl.catkeys b/data/catalogs/apps/terminal/pl.catkeys index 5dab771f8a..03b377fbe1 100644 --- a/data/catalogs/apps/terminal/pl.catkeys +++ b/data/catalogs/apps/terminal/pl.catkeys @@ -1,4 +1,4 @@ -1 polish x-vnd.Haiku-Terminal 1935314925 +1 polish x-vnd.Haiku-Terminal 3435701556 Not found. Terminal TermWindow Nie znaleziono. Switch Terminals Terminal TermWindow Przełącz Terminal Change directory Terminal TermView Zmień folder @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Tekst nie znaleziony. Find… Terminal TermWindow Znajdź… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Proces \"%1\" jest wciąż w użyciu.\nJeśli zamkniesz terminal, proces zostanie zatrzymany. Move here Terminal TermView Przenieś tutaj -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tŚcieżka dostępu do aktywnych procesów w\n\t\t\taktywnej karcie. Opcjonalnie maksymalna liczba komponentów ścieżek która\n\t\t\tmoże zostać ustalona. Np. '%2d' dla maksymalnie dwóch komponentów.\n\t%i\t-\tIndeks okna.\n\t%p\t-\tNazwa aktywnego procesu w aktywnej karcie.\n\t%t\t-\tNazwa aktywnej karty.\n\t%%\t-\tZnak '%'. Retro Terminal colors scheme Retro Error! Terminal getString Błąd! New tab Terminal TermWindow Nowa karta diff --git a/data/catalogs/apps/terminal/pt_BR.catkeys b/data/catalogs/apps/terminal/pt_BR.catkeys index dd4b655590..4c6fef86c0 100644 --- a/data/catalogs/apps/terminal/pt_BR.catkeys +++ b/data/catalogs/apps/terminal/pt_BR.catkeys @@ -1,4 +1,4 @@ -1 portuguese (brazil) x-vnd.Haiku-Terminal 3561344903 +1 portuguese (brazil) x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow Não localizado. Switch Terminals Terminal TermWindow Alternar Terminais Change directory Terminal TermView Mudar de pasta @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Texto não encontrado. Find… Terminal TermWindow Localizar… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow O processo \"%1\" ainda está executando.\nSe fechar o Terminal, o processo será morto. Move here Terminal TermView Mover aqui -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t %d\t -\t O diretório de trabalho atual do processo ativo na\n\t \t \t guia atual. Opcionalmente o número máximo de componentes do caminho\n\t \t \t pode ser especificado. Por exemplo, '%2d' para o máximo de dois componentes.\n\t %i\t -\t O índice da janela.\n\t %p\t -\t O nome do processo ativo na guia atual.\n\t %t\t -\t O título da guia atual.\n\t %%\t -\t O caractere '%'. Retro Terminal colors scheme Retrô Error! Terminal getString Erro! New tab Terminal TermWindow Nova aba diff --git a/data/catalogs/apps/terminal/ro.catkeys b/data/catalogs/apps/terminal/ro.catkeys index c7943183a7..1c5e2aacd5 100644 --- a/data/catalogs/apps/terminal/ro.catkeys +++ b/data/catalogs/apps/terminal/ro.catkeys @@ -1,4 +1,4 @@ -1 romanian x-vnd.Haiku-Terminal 2672618809 +1 romanian x-vnd.Haiku-Terminal 4173005440 Not found. Terminal TermWindow Nu a fost găsit. Switch Terminals Terminal TermWindow Comută terminale Change directory Terminal TermView Modifică dosar @@ -53,7 +53,6 @@ Text not found. Terminal TermWindow Nu s-a găsit textul. Find… Terminal TermWindow Caută... The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Procesul „%1” încă rulează.\nDacă închideți Terminalul, procesul va fi oprit. Move here Terminal TermView Mută aici -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tDosarul curent al procesuui activ în\n\t\t\ttabul curent. Poate fi specificat numărul maxim de componente ale căii. Ex: „%2d” pentru cel mult două componente.\n\t%i\t-\tIndicele de fereastră.\n\t%p\t-\tNumele procesului activ din tabul curent.\n\t%t\t-\tTitlul tabului curent.\n\t%%\t-\tCaracterul „%”. Error! Terminal getString Eroare! New tab Terminal TermWindow Tab nou The pattern specifying the tab titles. The following placeholders\ncan be used:\n Terminal AppearancePrefView Tiparul care specifică titlurile tabului curent. Următoarele marcaje\npot fi utilizate:\n diff --git a/data/catalogs/apps/terminal/ru.catkeys b/data/catalogs/apps/terminal/ru.catkeys index 57eb2a308f..4bfb6850e2 100644 --- a/data/catalogs/apps/terminal/ru.catkeys +++ b/data/catalogs/apps/terminal/ru.catkeys @@ -1,4 +1,4 @@ -1 russian x-vnd.Haiku-Terminal 3561344903 +1 russian x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow Текст не найден Switch Terminals Terminal TermWindow Переключить терминалы Change directory Terminal TermView Сменить каталог @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Текст не найден Find… Terminal TermWindow Найти… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Процесс \"%1\" все еще работает.\nЕсли вы закроете Терминал, то этот процесс будет уничтожен. Move here Terminal TermView Переместить сюда -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tТекущая директория активного процесса текущей вкладки.\n\t\t\tОпционально можно указать максимальное число отображаемых компонентов пути.\n\t\t\tНапример '%2d' отобразит последние 2 компонента.\n\t%i\t-\tНомер окна.\n\t%p\t-\tНазвание активного процесса в текущей вкладке.\n\t%t\t-\tЗаголовок текущей вкладки.\n\t%%\t-\tСимвол процента - '%'. Retro Terminal colors scheme Ретро Error! Terminal getString Ошибка! New tab Terminal TermWindow Новая вкладка diff --git a/data/catalogs/apps/terminal/sk.catkeys b/data/catalogs/apps/terminal/sk.catkeys index 22ba127f1b..94e393eaea 100644 --- a/data/catalogs/apps/terminal/sk.catkeys +++ b/data/catalogs/apps/terminal/sk.catkeys @@ -1,4 +1,4 @@ -1 slovak x-vnd.Haiku-Terminal 3561344903 +1 slovak x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow Nenájdené. Switch Terminals Terminal TermWindow Prepnúť terminály Change directory Terminal TermView Zmeniť adresár @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Text nenájdený. Find… Terminal TermWindow Nájsť… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Proces „%1“ ešte stále beží.\nAk zatvoríte Terminál, proces bude zabitý. Move here Terminal TermView Presunúť sem -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tAktuálny adresár aktívneho procesu\n\t\t\tv aktuálnej karte. Nepovinne je možné určiť maximálny počet\n\t\t\tzložiek cesty. Napr. „%2d“ pre najviac dve zložky.\n\t%i\t-\tIndex okna.\n\t%p\t-\tNázov aktívneho procesu v aktuálnej karte.\n\t%t\t-\tTitulok aktuálnej karty.\n\t%%\t-\tZnak „%“. Retro Terminal colors scheme Retro Error! Terminal getString Chyba! New tab Terminal TermWindow Nová karta diff --git a/data/catalogs/apps/terminal/sv.catkeys b/data/catalogs/apps/terminal/sv.catkeys index 2f0c2b0a71..0f20ed861c 100644 --- a/data/catalogs/apps/terminal/sv.catkeys +++ b/data/catalogs/apps/terminal/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-Terminal 3561344903 +1 swedish x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow Hittades ej. Switch Terminals Terminal TermWindow Växla terminal Change directory Terminal TermView Byt katalog @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow Text hittades inte. Find… Terminal TermWindow Sök... The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Processen \"%1\" körs fortfarande.\nOm du stänger Terminalen kommer processen att termineras. Move here Terminal TermView Flytta hit -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tDen valda flikens aktiva process arbetskatalog.\n\t\t\tEtt maximalt antal sökvägsdelar kan anges\n\t\t\tT.ex. '%2d' för som mest två delar.\n\t%i\t-\tFönstrets indexnummer.\n\t%p\t-\tDen valda flikens aktiva process namn.\n\t%t\t-\tDen valda flikens namn.\n\t%%\t-\tTecknet '%'. Retro Terminal colors scheme Retro Error! Terminal getString Fel! New tab Terminal TermWindow Ny flik diff --git a/data/catalogs/apps/terminal/uk.catkeys b/data/catalogs/apps/terminal/uk.catkeys index 4a991b0011..5503840d32 100644 --- a/data/catalogs/apps/terminal/uk.catkeys +++ b/data/catalogs/apps/terminal/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-Terminal 2672618809 +1 ukrainian x-vnd.Haiku-Terminal 4173005440 Not found. Terminal TermWindow Не знайдено. Switch Terminals Terminal TermWindow Перемкнути термінали Change directory Terminal TermView Змінити каталог @@ -53,7 +53,6 @@ Text not found. Terminal TermWindow Текст не знайдено. Find… Terminal TermWindow Знайти… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow Процес \"%1\" надалі запущено.\nЯкщо Ви закриєте Terminal, процес буде вбито. Move here Terminal TermView Перемістити сюди -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\tПоточний каталог активного процесу\n\t\t\tв поточній вкладці. Додатково можна вказати максимальну кількість компонентів шляху\n\t\t\t Наприклад '%2d' ніж 2 компоненти.\n\t%i\t-\tіндекс вікна.\n\t%p\t-\tІм'я активного процесу поточної вкладки.\n\t%%\t-\tІм'я поточної вкладки.\n\t%%\t-\tСимвол '%'. Error! Terminal getString Помилка! New tab Terminal TermWindow Нова вкладка The pattern specifying the tab titles. The following placeholders\ncan be used:\n Terminal AppearancePrefView Шаблон для імен вікон. Наступні заповнювачі\nможуть бути використані:\n diff --git a/data/catalogs/apps/terminal/zh_Hans.catkeys b/data/catalogs/apps/terminal/zh_Hans.catkeys index d4f7e46002..c6dc7932bc 100644 --- a/data/catalogs/apps/terminal/zh_Hans.catkeys +++ b/data/catalogs/apps/terminal/zh_Hans.catkeys @@ -1,4 +1,4 @@ -1 english x-vnd.Haiku-Terminal 3561344903 +1 english x-vnd.Haiku-Terminal 766764238 Not found. Terminal TermWindow 未找到。 Switch Terminals Terminal TermWindow 切换终端 Change directory Terminal TermView 更改目录 @@ -61,7 +61,6 @@ Text not found. Terminal TermWindow 文本未搜索到。 Find… Terminal TermWindow 查找… The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed. Terminal TermWindow \"%1\" 进程仍在运行。\n如果关闭终端，该进程将被杀死。 Move here Terminal TermView 移动到此 -\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'. Terminal ToolTips \t%d\t-\t当前标签中，活动进程的当前工作目录。\n\t\t组件可以指定的最大路径数量。例如，'%2d'，可以指定至多两个组件。\n\t%i\t-\t窗口的索引。\n\t%p\t-\t当前标签中的活动进程。\n\t%t\t-\t当前标签的标题。\n\t%%\t-\t字符 '%'。 Retro Terminal colors scheme 复古主题 Error! Terminal getString 错误！ New tab Terminal TermWindow 新建标签 diff --git a/data/catalogs/apps/webpositive/be.catkeys b/data/catalogs/apps/webpositive/be.catkeys index 925d87a970..b5a0184ba6 100644 --- a/data/catalogs/apps/webpositive/be.catkeys +++ b/data/catalogs/apps/webpositive/be.catkeys @@ -1,4 +1,4 @@ -1 belarusian x-vnd.Haiku-WebPositive 1513721873 +1 belarusian x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Паказваць кнопку "Дадому" Username: Authentication Panel Карыстальнік: Copy URL to clipboard Download Window Скапіяваць спасылку @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Паказваць укла About WebPositive Window Пра Праграму Finish: Download Window Finishing time Скончыць: Fonts Settings Window Шрыфты -Close WebPositive Window Зачыніць OK Download Window ОК Page source error WebPositive Window Памылка зыходнага коду старонкі Open blank page Settings Window Адчыніць пустую старонку diff --git a/data/catalogs/apps/webpositive/de.catkeys b/data/catalogs/apps/webpositive/de.catkeys index 22e2c06fe9..634635f628 100644 --- a/data/catalogs/apps/webpositive/de.catkeys +++ b/data/catalogs/apps/webpositive/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-WebPositive 1513721873 +1 german x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Home-Symbol anzeigen Username: Authentication Panel Benutzername: Copy URL to clipboard Download Window Adresse kopieren @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Reiter immer anzeigen About WebPositive Window Über Finish: Download Window Finishing time Fertig: Fonts Settings Window Schriftarten -Close WebPositive Window Schließen OK Download Window OK Page source error WebPositive Window Fehler im Quellcode der Seite Open blank page Settings Window Leere Seite öffnen diff --git a/data/catalogs/apps/webpositive/fi.catkeys b/data/catalogs/apps/webpositive/fi.catkeys index f66c245e60..f72e0505d4 100644 --- a/data/catalogs/apps/webpositive/fi.catkeys +++ b/data/catalogs/apps/webpositive/fi.catkeys @@ -1,4 +1,4 @@ -1 finnish x-vnd.Haiku-WebPositive 1513721873 +1 finnish x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Näytä aloitussivupainike Username: Authentication Panel Käyttäjätunnus: Copy URL to clipboard Download Window Kopioi verkko-osoite leikepöydälle @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Näytä välilehdet vain kun About WebPositive Window Ohjelmasta Finish: Download Window Finishing time Valmis: Fonts Settings Window Kirjasimet -Close WebPositive Window Sulje OK Download Window Valmis Page source error WebPositive Window Sivulähdevirhe Open blank page Settings Window Avaa tyhjä sivu diff --git a/data/catalogs/apps/webpositive/fr.catkeys b/data/catalogs/apps/webpositive/fr.catkeys index 2edf03c39f..aa7643e2ec 100644 --- a/data/catalogs/apps/webpositive/fr.catkeys +++ b/data/catalogs/apps/webpositive/fr.catkeys @@ -1,4 +1,4 @@ -1 french x-vnd.Haiku-WebPositive 1513721873 +1 french x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Afficher le bouton de la page d'accueil Username: Authentication Panel Utilisateur : Copy URL to clipboard Download Window Copier l'URL dans le presse-papiers @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Afficher les onglets même s About WebPositive Window À propos Finish: Download Window Finishing time Fin : Fonts Settings Window Polices -Close WebPositive Window Fermer OK Download Window OK Page source error WebPositive Window Erreur dans la page source Open blank page Settings Window Ouvrir une page blanche diff --git a/data/catalogs/apps/webpositive/hu.catkeys b/data/catalogs/apps/webpositive/hu.catkeys index 7fb0816dc7..26a74725e8 100644 --- a/data/catalogs/apps/webpositive/hu.catkeys +++ b/data/catalogs/apps/webpositive/hu.catkeys @@ -1,4 +1,4 @@ -1 hungarian x-vnd.Haiku-WebPositive 1513721873 +1 hungarian x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Kezdőlap-gomb megjelenítése Username: Authentication Panel Felhasználónév: Copy URL to clipboard Download Window Cím másolása a vágólapra @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window A fülek megjelenítése, ha About WebPositive Window Névjegy Finish: Download Window Finishing time Befejezés: Fonts Settings Window Betűtípusok -Close WebPositive Window Bezárás OK Download Window Rendben Page source error WebPositive Window Hiba az oldal forrásában Open blank page Settings Window Üres oldal megnyitása diff --git a/data/catalogs/apps/webpositive/ja.catkeys b/data/catalogs/apps/webpositive/ja.catkeys index 1055269d13..bd247f7e8d 100644 --- a/data/catalogs/apps/webpositive/ja.catkeys +++ b/data/catalogs/apps/webpositive/ja.catkeys @@ -1,11 +1,11 @@ -1 japanese x-vnd.Haiku-WebPositive 1513721873 +1 japanese x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window ホームボタンを表示する Username: Authentication Panel ユーザー名： Copy URL to clipboard Download Window URL をクリップボードにコピー -Cancel Settings Window キャンセル +Cancel Settings Window 中止 Close window WebPositive Window ウィンドウを閉じる Quit WebPositive 終了 -The download could not be opened. Download Window ダウンロードを開けませんでした。 +The download could not be opened. Download Window ダウンロードを開けませんでした。 The downloads folder could not be opened.\n\nError: %error Download Window Don't translate variable %error ダウンロードフォルダーを開けませんでした。\n\nエラー： %error Open location WebPositive Window url を開く Clear history WebPositive Window 履歴のクリア @@ -29,7 +29,7 @@ Find next WebPositive Window 次を検索 Download folder: Settings Window ダウンロードフォルダー： Edit WebPositive Window 編集 Over %hours hours left Download Window 残り %hours 時間以上 -Cancel Authentication Panel キャンセル +Cancel Authentication Panel 中止 Match case WebPositive Window 大文字と小文字を区別する Search page: Settings Window 検索ページ： Zoom text only WebPositive Window テキストのみ拡大 @@ -74,12 +74,11 @@ Show tabs if only one page is open Settings Window ページが一つだけ開 About WebPositive Window WebPositive について Finish: Download Window Finishing time 完了： Fonts Settings Window フォント -Close WebPositive Window 閉じる OK Download Window OK Page source error WebPositive Window ページソースのエラー Open blank page Settings Window 空白のページを開く New tabs: Settings Window 新しいタブ： -Cancel WebPositive Window キャンセル +Cancel WebPositive Window 中止 Open all WebPositive Window すべて開く Clear URL Bar クリア Cut URL Bar 切り取り diff --git a/data/catalogs/apps/webpositive/lt.catkeys b/data/catalogs/apps/webpositive/lt.catkeys index 08b907b6e0..eff17af191 100644 --- a/data/catalogs/apps/webpositive/lt.catkeys +++ b/data/catalogs/apps/webpositive/lt.catkeys @@ -1,4 +1,4 @@ -1 lithuanian x-vnd.Haiku-WebPositive 1513721873 +1 lithuanian x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Rodyti Namų mygtuką Username: Authentication Panel Naudotojo vardas: Copy URL to clipboard Download Window Kopijuoti URL adresą į iškarpinę @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Rodyti korteles net kai jų About WebPositive Window Apie Finish: Download Window Finishing time Numatoma pabaiga: Fonts Settings Window Šriftai -Close WebPositive Window Užverti OK Download Window Gerai Page source error WebPositive Window Tinklapio pirminio teksto klaida Open blank page Settings Window Atverti tuščią tinklapį diff --git a/data/catalogs/apps/webpositive/nl.catkeys b/data/catalogs/apps/webpositive/nl.catkeys index 09e89ce19d..9d3132baec 100644 --- a/data/catalogs/apps/webpositive/nl.catkeys +++ b/data/catalogs/apps/webpositive/nl.catkeys @@ -1,4 +1,4 @@ -1 dutch; flemish x-vnd.Haiku-WebPositive 1513721873 +1 dutch; flemish x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Thuisknop tonen Username: Authentication Panel Gebruikersnaam: Copy URL to clipboard Download Window URL naar klembord kopiëren @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Tabbladen ook tonen als slec About WebPositive Window Over Finish: Download Window Finishing time Voltooien: Fonts Settings Window Lettertypen -Close WebPositive Window Sluiten OK Download Window Ok Page source error WebPositive Window Paginabronfout Open blank page Settings Window Lege pagina openen diff --git a/data/catalogs/apps/webpositive/pl.catkeys b/data/catalogs/apps/webpositive/pl.catkeys index 044f5515d6..9fafbc5f22 100644 --- a/data/catalogs/apps/webpositive/pl.catkeys +++ b/data/catalogs/apps/webpositive/pl.catkeys @@ -1,4 +1,4 @@ -1 polish x-vnd.Haiku-WebPositive 3680831920 +1 polish x-vnd.Haiku-WebPositive 2400159322 Show home button Settings Window Pokaż przycisk domowy Username: Authentication Panel Nazwa użytkownika: Copy URL to clipboard Download Window Kopiuj adres URL do schowka @@ -73,7 +73,6 @@ Show tabs if only one page is open Settings Window Pokaż karty, nawet jeśli t About WebPositive Window O programie Finish: Download Window Finishing time Do zakończenia: Fonts Settings Window Czcionki -Close WebPositive Window Zamknij OK Download Window OK Page source error WebPositive Window Błąd strony źródłowej Open blank page Settings Window Otwórz pustą stronę diff --git a/data/catalogs/apps/webpositive/pt_BR.catkeys b/data/catalogs/apps/webpositive/pt_BR.catkeys index f8c0669ed8..a2bc9cfdef 100644 --- a/data/catalogs/apps/webpositive/pt_BR.catkeys +++ b/data/catalogs/apps/webpositive/pt_BR.catkeys @@ -1,4 +1,4 @@ -1 portuguese (brazil) x-vnd.Haiku-WebPositive 1513721873 +1 portuguese (brazil) x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Exibir botão home Username: Authentication Panel Nome de Usuário: Copy URL to clipboard Download Window Copiar URL para a área de transferência @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Exibir guias se apenas uma p About WebPositive Window Sobre Finish: Download Window Finishing time Término: Fonts Settings Window Fontes -Close WebPositive Window Fechar OK Download Window OK Page source error WebPositive Window Erro de origem da página Open blank page Settings Window Abrir página em branco diff --git a/data/catalogs/apps/webpositive/ru.catkeys b/data/catalogs/apps/webpositive/ru.catkeys index cf5c2647e4..f2f31c24a0 100644 --- a/data/catalogs/apps/webpositive/ru.catkeys +++ b/data/catalogs/apps/webpositive/ru.catkeys @@ -1,4 +1,4 @@ -1 russian x-vnd.Haiku-WebPositive 1513721873 +1 russian x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Показывать кнопку Домой Username: Authentication Panel Имя пользователя: Copy URL to clipboard Download Window Копировать ссылку на загрузку @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Всегда показыв About WebPositive Window О программе Finish: Download Window Finishing time Завершиться в: Fonts Settings Window Шрифты -Close WebPositive Window Закрыть OK Download Window OK Page source error WebPositive Window Ошибка в исходном коде страницы Open blank page Settings Window Открыть пустую страницу diff --git a/data/catalogs/apps/webpositive/sk.catkeys b/data/catalogs/apps/webpositive/sk.catkeys index 0cd7eb5665..3a4263b5c6 100644 --- a/data/catalogs/apps/webpositive/sk.catkeys +++ b/data/catalogs/apps/webpositive/sk.catkeys @@ -1,4 +1,4 @@ -1 slovak x-vnd.Haiku-WebPositive 1513721873 +1 slovak x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Zobraziť tlačidlo Domov Username: Authentication Panel Používateľské meno: Copy URL to clipboard Download Window Kopírovať URL do schránky @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Zobrazovať karty, aj ak je About WebPositive Window O aplikácii Finish: Download Window Finishing time Koniec: Fonts Settings Window Písma -Close WebPositive Window Zatvoriť OK Download Window OK Page source error WebPositive Window Chyba zdrojového kódu stránky Open blank page Settings Window Otvoriť prázdnu stránku diff --git a/data/catalogs/apps/webpositive/sv.catkeys b/data/catalogs/apps/webpositive/sv.catkeys index 6eef7b509b..ce2d8d97ec 100644 --- a/data/catalogs/apps/webpositive/sv.catkeys +++ b/data/catalogs/apps/webpositive/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-WebPositive 1513721873 +1 swedish x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window Visa hem-knappen Username: Authentication Panel Användarnamn: Copy URL to clipboard Download Window Kopiera URL till urklipp @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window Visa fliar när endast en si About WebPositive Window Om Finish: Download Window Finishing time Färdig: Fonts Settings Window Teckensnitt -Close WebPositive Window Stäng OK Download Window OK Page source error WebPositive Window Fel på sidan Open blank page Settings Window Öppna blank sida diff --git a/data/catalogs/apps/webpositive/zh_Hans.catkeys b/data/catalogs/apps/webpositive/zh_Hans.catkeys index 4109599157..572d754276 100644 --- a/data/catalogs/apps/webpositive/zh_Hans.catkeys +++ b/data/catalogs/apps/webpositive/zh_Hans.catkeys @@ -1,4 +1,4 @@ -1 english x-vnd.Haiku-WebPositive 1513721873 +1 english x-vnd.Haiku-WebPositive 233049275 Show home button Settings Window 显示 home 按钮 Username: Authentication Panel 用户名： Copy URL to clipboard Download Window 复制 URL 到剪贴板 @@ -74,7 +74,6 @@ Show tabs if only one page is open Settings Window 只有单页则显示标签 About WebPositive Window 关于 Finish: Download Window Finishing time 完成： Fonts Settings Window 字体 -Close WebPositive Window 关闭 OK Download Window 确定 Page source error WebPositive Window 页面源码出错 Open blank page Settings Window 打开空白页 diff --git a/data/catalogs/kits/ja.catkeys b/data/catalogs/kits/ja.catkeys index 768688b063..44a546d427 100644 --- a/data/catalogs/kits/ja.catkeys +++ b/data/catalogs/kits/ja.catkeys @@ -1,5 +1,5 @@ 1 japanese x-vnd.Haiku-libbe 672385853 -gamma AboutWindow γ +gamma AboutWindow γ beta AboutWindow β %3.2f GiB StringForSize %3.2f GiB Written by: AboutWindow 作者: diff --git a/data/catalogs/kits/tracker/be.catkeys b/data/catalogs/kits/tracker/be.catkeys index 5f6177d13b..4b46d9187a 100644 --- a/data/catalogs/kits/tracker/be.catkeys +++ b/data/catalogs/kits/tracker/be.catkeys @@ -1,4 +1,4 @@ -1 belarusian x-vnd.Haiku-libtracker 1610004061 +1 belarusian x-vnd.Haiku-libtracker 3375521561 common B_COMMON_DIRECTORY агульны OK WidgetAttributeText ОК Icon view VolumeWindow Від іконак @@ -81,7 +81,6 @@ Decrease size DeskWindow Паменшыць памер Size ContainerWindow Памер All disks AutoMounterSettings Усе дыскі Would you like to find some other suitable application? FSUtils Жадаеце пашукаць іншую падыходзячую праграму? -Ask before deleting for good SettingsView Спытаць перад выдаленнем Finish: %time - %finishtime left StatusWindow Завяршэнне: %time - засталося %finishtime Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n FSUtils Немагчыма адкрыць \"%document\" праграмай \"%app\" (Не хапае: %library). \n no items CountView няма элементаў @@ -102,7 +101,6 @@ New folder FilePanelPriv Новы каталог %name info InfoWindow InfoWindow Title %name інфа Favorites FavoritesMenu Выбранае Add-ons VolumeWindow Дапаўненні -Move deleted files to Trash first SettingsView Перасунуць выдаленыя файлы спярша ў Сметніцу Sorry, you can't copy items to the Trash. PoseView Прабачце, вы не можаце капіяваць элементы ў Сметніцу. List view VolumeWindow Від спісу matches wildcard expression SelectionWindow супадае з падстановачнымі выразамі @@ -258,7 +256,6 @@ TiB WidgetAttributeText ЦіБ The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Файл \"%name\" ужо існуе ў пазначаным каталозе. Жадаеце замяніць яго? Cancel ContainerWindow Адмена Only the boot disk AutoMounterSettings Толькі загрузачны дыск -Trash TrackerSettingsWindow Сметніца If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Калi вы %ifYouDoAction каталог канфігурацыі, %osName можа паводзіць сябе неадэкватна!\n\nВы ўпэўнены што жадаеце зрабіць гэта? Unmount ContainerWindow Размантаваць Copy layout ContainerWindow Капіяваць макет diff --git a/data/catalogs/kits/tracker/de.catkeys b/data/catalogs/kits/tracker/de.catkeys index a0adf743b2..96eb7df55e 100644 --- a/data/catalogs/kits/tracker/de.catkeys +++ b/data/catalogs/kits/tracker/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-libtracker 1610004061 +1 german x-vnd.Haiku-libtracker 4167158175 common B_COMMON_DIRECTORY Allgemein OK WidgetAttributeText OK Icon view VolumeWindow Icon-Ansicht @@ -74,6 +74,7 @@ Arrange by ContainerWindow Icons ordnen nach Mount server error AutoMounterSettings Mountserver-Fehler Search FindPanel Suchen Preparing to empty Trash… StatusWindow Leeren des Papierkorbs wird vorbereitet… +You cannot put the selected item(s) into the trash. FSUtils Die ausgewählten Objekte können nicht in den Papierkorb verschoben werden. Disks Model Datenträger Create link ContainerWindow Verknüpfung erstellen develop B_COMMON_DEVELOP_DIRECTORY Programmierung @@ -81,7 +82,6 @@ Decrease size DeskWindow Verkleinern Size ContainerWindow Größe All disks AutoMounterSettings Alle Datenträger Would you like to find some other suitable application? FSUtils Soll eine andere passende Anwendung gesucht werden? -Ask before deleting for good SettingsView Vor dem endgültigen Löschen nachfragen Finish: %time - %finishtime left StatusWindow Fertig: %time - Noch %finishtime Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n FSUtils \"%document\" konnte nicht mit der Anwendung \"%app\" geöffnet werden (fehlende Bibliothek: %library.). \n no items CountView keine @@ -102,7 +102,6 @@ New folder FilePanelPriv Neuer Ordner %name info InfoWindow InfoWindow Title %name Info Favorites FavoritesMenu Favoriten Add-ons VolumeWindow Add-ons -Move deleted files to Trash first SettingsView Gelöschte Dateien erst in den Papierkorb verschieben Sorry, you can't copy items to the Trash. PoseView Objekte können leider nicht in den Papierkorb kopiert werden. List view VolumeWindow Listenansicht matches wildcard expression SelectionWindow entspricht Platzhalter-Ausdruck @@ -258,7 +257,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Die Datei \"%name\" existiert bereits in diesem Ordner. Soll sie ersetzt werden? Cancel ContainerWindow Abbrechen Only the boot disk AutoMounterSettings Nur das Boot-Laufwerk -Trash TrackerSettingsWindow Papierkorb If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Wird der Konfiguration-Ordner %ifYouDoAction, kann %osName vielleicht nicht mehr fehlerfrei arbeiten! Unmount ContainerWindow Aushängen Copy layout ContainerWindow Anordnung kopieren diff --git a/data/catalogs/kits/tracker/el.catkeys b/data/catalogs/kits/tracker/el.catkeys index 0628fecba3..635f8873cf 100644 --- a/data/catalogs/kits/tracker/el.catkeys +++ b/data/catalogs/kits/tracker/el.catkeys @@ -1,4 +1,4 @@ -1 greek, modern (1453-) x-vnd.Haiku-libtracker 2448887337 +1 greek, modern (1453-) x-vnd.Haiku-libtracker 3015739927 common B_COMMON_DIRECTORY κοινό OK WidgetAttributeText Εντάξει Icon view VolumeWindow Προβολή εικονιδίου @@ -242,7 +242,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv το αρχείο \"%name\" υπάρχει ήδη στον προσδιορισμένο φάκελο. Θέλετε σίγουρα να το αντικαταστήσετε; Cancel ContainerWindow Άκυρο Only the boot disk AutoMounterSettings Μόνο ο δίσκος εκκίνησης -Trash TrackerSettingsWindow Απορρίματα Unmount ContainerWindow Αποπροσάρτηση Copy layout ContainerWindow Αντιγραφή διάταξης label too long PoseView ετικέτα πολύ μεγάλη diff --git a/data/catalogs/kits/tracker/fi.catkeys b/data/catalogs/kits/tracker/fi.catkeys index ed7430ed34..a845ad861d 100644 --- a/data/catalogs/kits/tracker/fi.catkeys +++ b/data/catalogs/kits/tracker/fi.catkeys @@ -1,4 +1,4 @@ -1 finnish x-vnd.Haiku-libtracker 1610004061 +1 finnish x-vnd.Haiku-libtracker 3375521561 common B_COMMON_DIRECTORY yhteinen OK WidgetAttributeText Valmis Icon view VolumeWindow Kuvakenäkymä @@ -81,7 +81,6 @@ Decrease size DeskWindow Pienennä kokoa Size ContainerWindow Koko All disks AutoMounterSettings Kaikki levyt Would you like to find some other suitable application? FSUtils Haluaisitko etsiä jonkun toisen sopivan sovelluksen? -Ask before deleting for good SettingsView Kysy ennen kuin poistetaan pysyvästi Finish: %time - %finishtime left StatusWindow Loppuu: %time - %finishtime jäljellä Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n FSUtils Asiakirjan ”%document” avaus sovelluksella ”%app” epäonnistui (Puuttuvat kirjastot: %library). \n no items CountView ei kohteita @@ -102,7 +101,6 @@ New folder FilePanelPriv Uusi kansio %name info InfoWindow InfoWindow Title %name-tiedot Favorites FavoritesMenu Suosikit Add-ons VolumeWindow Lisäosat -Move deleted files to Trash first SettingsView Siirrä poistetut tiedostot ensin Roskakoriin Sorry, you can't copy items to the Trash. PoseView Et voi kopioida kohteita roskakoriin. List view VolumeWindow Luettelonäkymä matches wildcard expression SelectionWindow täsmää jokerilausekkeeseen @@ -258,7 +256,6 @@ TiB WidgetAttributeText tebitavua The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Tiedosto ”%name” on jo olemassa määritellyssä kansiossa. Haluatko korvata sen? Cancel ContainerWindow Peru Only the boot disk AutoMounterSettings Vain alkulatauslevy -Trash TrackerSettingsWindow Roskakori If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Jos kohdistat toiminnon ”%ifYouDoAction” asetuskansioon, ”%osName” ei ehkä toimi oikein!\n\nOletko varma, että haluat tehdä tämän? Unmount ContainerWindow Irrota Copy layout ContainerWindow Kopioi sijoittelu diff --git a/data/catalogs/kits/tracker/fr.catkeys b/data/catalogs/kits/tracker/fr.catkeys index a1eaa9f84f..d34e810927 100644 --- a/data/catalogs/kits/tracker/fr.catkeys +++ b/data/catalogs/kits/tracker/fr.catkeys @@ -1,4 +1,4 @@ -1 french x-vnd.Haiku-libtracker 1610004061 +1 french x-vnd.Haiku-libtracker 3375521561 common B_COMMON_DIRECTORY commun OK WidgetAttributeText OK Icon view VolumeWindow Vue en icônes @@ -81,7 +81,6 @@ Decrease size DeskWindow Diminuer la taille Size ContainerWindow Taille All disks AutoMounterSettings Tout les disques Would you like to find some other suitable application? FSUtils Souhaitez-vous rechercher une autre application appropriée ? -Ask before deleting for good SettingsView Demander avant de supprimer pour de bon Finish: %time - %finishtime left StatusWindow Fin : %time - il reste %finishtime Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n FSUtils Impossible d'ouvrir « %document » avec l'application « %app » (Il manque la bibliothèque : %library).\n no items CountView aucun élément @@ -102,7 +101,6 @@ New folder FilePanelPriv Nouveau dossier %name info InfoWindow InfoWindow Title Informations sur %name Favorites FavoritesMenu Favoris Add-ons VolumeWindow Extensions -Move deleted files to Trash first SettingsView Déplacez les fichiers supprimés dans la corbeille en premier Sorry, you can't copy items to the Trash. PoseView Désolé, vous ne pouvez pas copier des éléments dans la Corbeille. List view VolumeWindow Vue en liste matches wildcard expression SelectionWindow correspond à l'expression générique @@ -258,7 +256,6 @@ TiB WidgetAttributeText Tio The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Le fichier « %name » existe déjà dans le dossier indiqué. Voulez-vous le remplacer ? Cancel ContainerWindow Annuler Only the boot disk AutoMounterSettings Seulement le disque de démarrage -Trash TrackerSettingsWindow Corbeille If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Si vous %ifYouDoAction le dossier de configuration, %osName pourrait ne pas se comporter correctement !\n\nÊtes vous sûr de vouloir effectuer cette opération ? Unmount ContainerWindow Démonter Copy layout ContainerWindow Copier la disposition diff --git a/data/catalogs/kits/tracker/hi.catkeys b/data/catalogs/kits/tracker/hi.catkeys index 5ed8a74c01..00fd369d00 100644 --- a/data/catalogs/kits/tracker/hi.catkeys +++ b/data/catalogs/kits/tracker/hi.catkeys @@ -1,4 +1,4 @@ -1 hindi x-vnd.Haiku-libtracker 891685329 +1 hindi x-vnd.Haiku-libtracker 1458537919 common B_COMMON_DIRECTORY सामान्य OK WidgetAttributeText ठीक है Icon view VolumeWindow चिह्न दृश्य @@ -242,7 +242,6 @@ TiB WidgetAttributeText ती बी The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv फ़ाइल \"%name\"पहले से निर्दिष्ट फ़ोल्डर में मौजूद है. क्या आप इसे बदलना चाहते हैं? Cancel ContainerWindow रद्द करें Only the boot disk AutoMounterSettings केवल बूट डिस्क -Trash TrackerSettingsWindow रद्दी Unmount ContainerWindow अनमाउंट Copy layout ContainerWindow लेआउट की नकल करें label too long PoseView लेबल बहुत लंबा हैं diff --git a/data/catalogs/kits/tracker/hu.catkeys b/data/catalogs/kits/tracker/hu.catkeys index 24ff35add5..ae42ac9ffe 100644 --- a/data/catalogs/kits/tracker/hu.catkeys +++ b/data/catalogs/kits/tracker/hu.catkeys @@ -1,4 +1,4 @@ -1 hungarian x-vnd.Haiku-libtracker 1610004061 +1 hungarian x-vnd.Haiku-libtracker 4167158175 common B_COMMON_DIRECTORY Közös OK WidgetAttributeText Rendben Icon view VolumeWindow Ikon nézet @@ -74,6 +74,7 @@ Arrange by ContainerWindow Rendezés Mount server error AutoMounterSettings Csatolási hiba Search FindPanel Keresés Preparing to empty Trash… StatusWindow Felkészülés a Szemetes ürítésére… +You cannot put the selected item(s) into the trash. FSUtils A kijelölt elem(ek) nem rakható(k) a Szemetesbe. Disks Model Lemezek Create link ContainerWindow Hivatkozás készítése develop B_COMMON_DEVELOP_DIRECTORY Fejlesztés @@ -81,7 +82,6 @@ Decrease size DeskWindow Méret csökkentése Size ContainerWindow Méret All disks AutoMounterSettings Összes lemez Would you like to find some other suitable application? FSUtils Szeretne keresni egy másik megfelelő programot? -Ask before deleting for good SettingsView Törlés előtt kérdezzen Finish: %time - %finishtime left StatusWindow Befejezés: %time - %finishtime maradt Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n FSUtils Nem sikerült megnyitni a dokumentumot (%document) a programmal (%app).\n\tHiányzó funkciótár: %library. \n no items CountView nincs elem @@ -102,7 +102,6 @@ New folder FilePanelPriv Új mappa %name info InfoWindow InfoWindow Title %name Favorites FavoritesMenu Kedvencek Add-ons VolumeWindow Kiegészítők -Move deleted files to Trash first SettingsView A törölt fájlok először a Szemetesbe kerüljenek Sorry, you can't copy items to the Trash. PoseView Sajnáljuk, de nem lehet a Szemetesbe másolni. List view VolumeWindow Lista nézet matches wildcard expression SelectionWindow megfelel a helyettesítő kifejezésnek @@ -258,7 +257,6 @@ TiB WidgetAttributeText TB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv A megadott mappában már létezik egy ilyen nevű fájl: %name. Szeretné felülírni? Cancel ContainerWindow Mégse Only the boot disk AutoMounterSettings Csak a rendszer lemezt -Trash TrackerSettingsWindow Szemetes If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Ha %ifYouDoAction a konfigurációs mappát, akkor lehet, hogy a %osName nem fog megfelelően működni!\n\nBiztosan folytatni akarja? Unmount ContainerWindow Leválasztás Copy layout ContainerWindow Elrendezés másolása diff --git a/data/catalogs/kits/tracker/ja.catkeys b/data/catalogs/kits/tracker/ja.catkeys index 9d20a49ac5..6499e50dce 100644 --- a/data/catalogs/kits/tracker/ja.catkeys +++ b/data/catalogs/kits/tracker/ja.catkeys @@ -1,4 +1,4 @@ -1 japanese x-vnd.Haiku-libtracker 1989647614 +1 japanese x-vnd.Haiku-libtracker 251834432 OK WidgetAttributeText OK Icon view VolumeWindow アイコン表示 Add-ons FilePanelPriv アドオン @@ -27,11 +27,11 @@ Sorry, you can't save things at the root of your system. FilePanelPriv シス Show shared volumes on Desktop SettingsView 共有ディスクをデスクトップに表示する Paste links ContainerWindow リンクを貼り付ける Name OpenWithWindow 名前 -Could not open \"%document\" because application \"%app\" is in the Trash. FSUtils \"%app\" はごみ箱に捨てられたため、\"%document\" を開けません。 +Could not open \"%document\" because application \"%app\" is in the Trash. FSUtils \"%app\" はごみ箱にあるため、\"%document\" を開けません。 File ContainerWindow ファイル Handles any %type OpenWithWindow すべての%typeに対応 Delete ContainerWindow 削除 -32 x 32 ContainerWindow 32 × 32 +32 x 32 ContainerWindow 32 x 32 Cannot unmount the boot volume \"%name\". FSUtils 起動ボリューム \"%name\" をマウント解除できません。 Open with… ContainerWindow 指定アプリケーションで開く… Write FilePermissionsView 書き込み @@ -72,15 +72,15 @@ Arrange by ContainerWindow 並べ換え Mount server error AutoMounterSettings マウントサーバーエラー Search FindPanel 検索 Preparing to empty Trash… StatusWindow ごみ箱を空にする準備をしています… +You cannot put the selected item(s) into the trash. FSUtils 選択した項目をごみ箱に移動できません Disks Model ディスク Create link ContainerWindow リンクの作成 Decrease size DeskWindow サイズを小さく Size ContainerWindow サイズ All disks AutoMounterSettings 全パーティション Would you like to find some other suitable application? FSUtils 他に適切なアプリケーションを検索しますか？ -Ask before deleting for good SettingsView 完全に削除する前に尋ねる Finish: %time - %finishtime left StatusWindow 終了: %time - 残り %finishtime -Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n FSUtils %libraryライブラリーがインストールされてないため、\"%app\" を使って \"%document\" を開くことはできませんでした。 +Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n FSUtils %libraryライブラリがインストールされてないため、\"%app\" を使って \"%document\" を開くことはできませんでした。 no items CountView 0 項目 Ignore case SelectionWindow 大文字/小文字を区別しない is not FindPanel 除く @@ -99,7 +99,6 @@ New folder FilePanelPriv 新規フォルダー %name info InfoWindow InfoWindow Title %name の情報 Favorites FavoritesMenu お気に入り Add-ons VolumeWindow アドオン -Move deleted files to Trash first SettingsView 削除されたファイルを最初にごみ箱に移動する Sorry, you can't copy items to the Trash. PoseView ごみ箱にコピーすることはできません。 List view VolumeWindow 一覧表示 matches wildcard expression SelectionWindow ワイルドカード表現と一致 @@ -118,7 +117,7 @@ rename TextWidget As in 'to rename this folder...' (en) 'Um diesen Ordner umzube home B_USER_DIRECTORY ホーム Select… ContainerWindow 選択… Copy to ContainerWindow 指定先にコピー -Move to Trash ContainerWindow ごみ箱に捨てる +Move to Trash ContainerWindow ごみ箱に移動 Move to ContainerWindow 指定先に移動 Create %s clipping PoseView %s クリップを作成 Set new link target InfoWindow リンク先を変更 @@ -198,16 +197,16 @@ of %items StatusWindow / %items Description: InfoWindow 説明： New DeskWindow 新規作成 Open InfoWindow 開く -64 x 64 ContainerWindow 64 × 64 +64 x 64 ContainerWindow 64 x 64 Replace all FSUtils すべて置換 Preparing to restore items… StatusWindow 復元の準備をしています… Replace other file WidgetAttributeText 既存の項目を置き換える -Some of the selected items cannot be moved to the Trash. Would you like to delete them instead? (This operation cannot be reverted.) PoseView いくつかの選択項目はごみ箱に捨てられません。完全に削除してもよろしいですか？元に戻せませんので、ご注意ください。 +Some of the selected items cannot be moved to the Trash. Would you like to delete them instead? (This operation cannot be reverted.) PoseView いくつかの選択項目はごみ箱に移動できません。完全に削除してもよろしいですか？元に戻せませんので、ご注意ください。 You cannot create a link to the root directory. FSUtils ルートフォルダーにはリンクを作成できません。 -48 x 48 ContainerWindow 48 × 48 +48 x 48 ContainerWindow 48 x 48 Resize to fit VolumeWindow 最適な表示サイズに変更 Could not find application \"%appname\" OpenWithWindow アプリケーション \"%appname\" が見つかりませんでした -The selected item cannot be moved to the Trash. Would you like to delete it instead? (This operation cannot be reverted.) PoseView 選択した項目をごみ箱に捨てることはできません。完全に削除しても良いでしょうか？元は戻せませんので、ご注意ください。 +The selected item cannot be moved to the Trash. Would you like to delete it instead? (This operation cannot be reverted.) PoseView 選択した項目をごみ箱に移動できません。完全に削除しても良いでしょうか？元は戻せませんので、ご注意ください。 Invert SelectionWindow 反転 Save Query as template… FindPanel クエリテンプレートとして保存… rename InfoWindow As in 'if you rename this folder...' (en) 'Wird dieser Ordner umbenannt...' (de) 名前の変更 @@ -219,7 +218,7 @@ Select SelectionWindow 選択 Or FindPanel または The Tracker must be running to see set the default printer. PoseView デフォルトプリンタを設定するには、 Tracker が実行されている必要があります。 by formula FindPanel 式で検索 -40 x 40 DeskWindow 40 × 40 +40 x 40 DeskWindow 40 x 40 Name PoseView 名前 Group FilePermissionsView グループ Version: InfoWindow バージョン： @@ -249,11 +248,10 @@ Paste ContainerWindow 貼り付け Modified: InfoWindow 更新日時： Error moving \"%name\". FSUtils \"%name\"を移動中にエラーが発生しました。 TiB WidgetAttributeText TiB -40 x 40 ContainerWindow 40 × 40 +40 x 40 ContainerWindow 40 x 40 The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv 指定のフォルダーに\"%name\"というファイルがすでに存在します。置き換えますか？ Cancel ContainerWindow 中止 Only the boot disk AutoMounterSettings 起動ディスクのみ -Trash TrackerSettingsWindow ごみ箱 If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils config フォルダーを%ifYouDoAction した場合、%osName が正常に動作しなくなる可能性があります!\n\n本当に続けますか? Unmount ContainerWindow マウント解除 Copy layout ContainerWindow レイアウトをコピー @@ -264,7 +262,7 @@ Sorry, you cannot edit that attribute. WidgetAttributeText この属性は編 Name ContainerWindow 名前 Disk mount settings AutoMounterSettings ディスクマウント設定 Reverse order ContainerWindow 逆順にする -48 x 48 DeskWindow 48 × 48 +48 x 48 DeskWindow 48 x 48 OK OpenWithWindow OK Add current folder FilePanelPriv このフォルダーを追加 Could not open \"%document\" with application \"%app\" (Missing symbol: %symbol). \n FSUtils \"%document\" を \"%app\" で開けませんでした (シンボル %symbol が見つかりません)。\n @@ -310,7 +308,7 @@ Cancel PoseView 中止 You can't move or copy items to read-only volumes. FSUtils 読み取り専用パーティションへファイルまたはフォルダーを移動やコピーはできません。 Unknown FilePermissionsView 不明 All files and folders FindPanel すべてのファイルとフォルダー -Could not open \"%document\" (Missing libraries: %library). \n FSUtils %libraryライブラリーがインストールされてないため、\"%document\" を開けませんでした。\n +Could not open \"%document\" (Missing libraries: %library). \n FSUtils %libraryライブラリがインストールされてないため、\"%document\" を開けませんでした。\n The Tracker must be running to see Info windows. PoseView 情報ウィンドウを表示するには、Trackerが実行されている必要があります。 Other FilePermissionsView その他 Query name: FindPanel クエリ名： @@ -339,7 +337,7 @@ You can't move a folder into itself or any of its own sub-folders. FSUtils フ List view ContainerWindow 一覧表示 Handles any file OpenWithWindow すべてのファイルに対応 Get info FilePanelPriv 詳細情報… -32 x 32 DeskWindow 32 × 32 +32 x 32 DeskWindow 32 x 32 Cancel FilePanelPriv 中止 The application \"%appname\" does not support the type of document you are about to open.\nAre you sure you want to proceed?\n\nIf you know that the application supports the document type, you should contact the publisher of the application and ask them to update their application to list the type of your document as supported. OpenWithWindow アプリケーション \"%appname\" は開こうとしているドキュメントタイプをサポートしていません。\n本当に進めても良いですか?\n\n アプリケーションがサポートすることがわかっている場合は、アプリケーションの製作元にドキュメントタイプをサポートに加えるように問い合わせてください。 Disks DirMenu ディスク @@ -372,7 +370,7 @@ Favorites FilePanelPriv お気に入り Name QueryPoseView 名前 Delete FSUtils 削除 Modified FindPanel 更新日時 -Error moving \"%name\" to Trash. (%error) FSUtils \"%name\" をごみ箱に捨てようとしたら、エラーが発生しました。(%error) +Error moving \"%name\" to Trash. (%error) FSUtils \"%name\" をごみ箱に移動しようとしたら、エラーが発生しました。(%error) You can't replace a folder with one of its sub-folders. FSUtils サブフォルダーを同名のフォルダーと置き換えられません。 FavoritesMenu <最近使った項目はありません> Preferences… ContainerWindow 設定… @@ -425,7 +423,7 @@ ends with FindPanel 指定文字列で終わる New ContainerWindow 新規 Name matches wildcard expression:### SelectionWindow ファイル名がワイルドカード表現と一致： ### less than FindPanel より小さい -64 x 64 DeskWindow 64 × 64 +64 x 64 DeskWindow 64 x 64 Modified ContainerWindow 更新日時 Edit Query template FindPanel クエリテンプレートを編集 Prompt FSUtils プロンプト diff --git a/data/catalogs/kits/tracker/lt.catkeys b/data/catalogs/kits/tracker/lt.catkeys index 430ffa1e52..cb31d01565 100644 --- a/data/catalogs/kits/tracker/lt.catkeys +++ b/data/catalogs/kits/tracker/lt.catkeys @@ -1,4 +1,4 @@ -1 lithuanian x-vnd.Haiku-libtracker 2808668971 +1 lithuanian x-vnd.Haiku-libtracker 3375521561 common B_COMMON_DIRECTORY Bendra OK WidgetAttributeText Gerai Icon view VolumeWindow Rodyti piktogramas @@ -256,7 +256,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Paskirties aplanke jau yra failas „%name“. Ar norite jį pakeisti? Cancel ContainerWindow Atsisakyti Only the boot disk AutoMounterSettings Tik paleidimo tomą -Trash TrackerSettingsWindow Šiukšlinė If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Jeigu %ifYouDoAction konfigūracijos aplanką, „%osName“ sistemos elgesys taps nenuspėjamas!\n\nAr tikrai norite tai atlikti? Unmount ContainerWindow Atjungti Copy layout ContainerWindow Kopijuoti išdėstymą diff --git a/data/catalogs/kits/tracker/nl.catkeys b/data/catalogs/kits/tracker/nl.catkeys index 07a5f48fd3..18585860b6 100644 --- a/data/catalogs/kits/tracker/nl.catkeys +++ b/data/catalogs/kits/tracker/nl.catkeys @@ -1,4 +1,4 @@ -1 dutch; flemish x-vnd.Haiku-libtracker 154076124 +1 dutch; flemish x-vnd.Haiku-libtracker 720928714 common B_COMMON_DIRECTORY algemeen OK WidgetAttributeText OK Icon view VolumeWindow Icoonweergave @@ -256,7 +256,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Het bestand met de naam \"%name\" bestaat al in de gespecifieerde map. Wilt u het vervangen? Cancel ContainerWindow Annuleren Only the boot disk AutoMounterSettings Alleen de opstartschijf -Trash TrackerSettingsWindow Prullenbak If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Als u %ifYouDoAction de config map, dan kan %osName wellicht niet meer correct functioneren!\n\nWeet u zeker dat u dit wilt doen? Unmount ContainerWindow Onttrekken Copy layout ContainerWindow Indeling kopiëren diff --git a/data/catalogs/kits/tracker/pl.catkeys b/data/catalogs/kits/tracker/pl.catkeys index 68705166ab..668887f661 100644 --- a/data/catalogs/kits/tracker/pl.catkeys +++ b/data/catalogs/kits/tracker/pl.catkeys @@ -1,4 +1,4 @@ -1 polish x-vnd.Haiku-libtracker 3952097682 +1 polish x-vnd.Haiku-libtracker 223982976 common B_COMMON_DIRECTORY common OK WidgetAttributeText OK Icon view VolumeWindow Widok ikon @@ -253,7 +253,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Plik o nazwie \"%name\" już istnieje w tej lokalizacji. Czy chcesz go zamienić? Cancel ContainerWindow Anuluj Only the boot disk AutoMounterSettings Tylko dysk bootujący -Trash TrackerSettingsWindow Kosz Unmount ContainerWindow Odmontuj Copy layout ContainerWindow Kopiuj motyw label too long PoseView opis zbyt długi diff --git a/data/catalogs/kits/tracker/pt_BR.catkeys b/data/catalogs/kits/tracker/pt_BR.catkeys index a291b52d6b..3699f5ab0d 100644 --- a/data/catalogs/kits/tracker/pt_BR.catkeys +++ b/data/catalogs/kits/tracker/pt_BR.catkeys @@ -1,4 +1,4 @@ -1 portuguese (brazil) x-vnd.Haiku-libtracker 1610004061 +1 portuguese (brazil) x-vnd.Haiku-libtracker 3375521561 common B_COMMON_DIRECTORY comum OK WidgetAttributeText OK Icon view VolumeWindow Em ícones @@ -81,7 +81,6 @@ Decrease size DeskWindow Diminuir tamanho Size ContainerWindow Tamanho All disks AutoMounterSettings Todos os discos Would you like to find some other suitable application? FSUtils Você gostaria de encontrar outro aplicativo que possa servir? -Ask before deleting for good SettingsView Perguntar antes de eliminar para sempre Finish: %time - %finishtime left StatusWindow Término: %time - %finishtime restante Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n FSUtils Não foi possível abrir \"%document\" com o aplicativo \"%app\" (Bibliotecas faltantes: %library). \n no items CountView sem itens @@ -102,7 +101,6 @@ New folder FilePanelPriv Nova pasta %name info InfoWindow InfoWindow Title Informações de %name Favorites FavoritesMenu Favoritos Add-ons VolumeWindow Adicionais -Move deleted files to Trash first SettingsView Mover arquivos eliminados para a Lixeira primeiro Sorry, you can't copy items to the Trash. PoseView Desculpe, você não pode copiar itens para a Lixeira. List view VolumeWindow Em lista matches wildcard expression SelectionWindow encaixa na expressão coringa @@ -258,7 +256,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv O arquivo \"%name\" já existe na pasta especificada. Deseja substituí-lo? Cancel ContainerWindow Cancelar Only the boot disk AutoMounterSettings Somente o disco de inicialização -Trash TrackerSettingsWindow Lixeira If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Se %ifYouDoAction a pasta config, %osName pode não se comportar apropriadamente!\n\nEstá seguro de que quer fazer isto? Unmount ContainerWindow Desmontar Copy layout ContainerWindow Copiar layout diff --git a/data/catalogs/kits/tracker/ro.catkeys b/data/catalogs/kits/tracker/ro.catkeys index d624a9d9a8..1b6c45b5ec 100644 --- a/data/catalogs/kits/tracker/ro.catkeys +++ b/data/catalogs/kits/tracker/ro.catkeys @@ -1,4 +1,4 @@ -1 romanian x-vnd.Haiku-libtracker 2264047972 +1 romanian x-vnd.Haiku-libtracker 2830900562 OK WidgetAttributeText OK Icon view VolumeWindow Vizualizare pictogramă Add-ons FilePanelPriv Module @@ -202,7 +202,6 @@ TiB WidgetAttributeText TiB 40 x 40 ContainerWindow 40 x 40 Cancel ContainerWindow Anulează Only the boot disk AutoMounterSettings Numai discul de boot -Trash TrackerSettingsWindow Gunoi Unmount ContainerWindow Demontează Copy layout ContainerWindow Copiază aranjament label too long PoseView etichetă prea lungă diff --git a/data/catalogs/kits/tracker/ru.catkeys b/data/catalogs/kits/tracker/ru.catkeys index 6fd023bcaa..24b673b562 100644 --- a/data/catalogs/kits/tracker/ru.catkeys +++ b/data/catalogs/kits/tracker/ru.catkeys @@ -1,4 +1,4 @@ -1 russian x-vnd.Haiku-libtracker 154076124 +1 russian x-vnd.Haiku-libtracker 720928714 common B_COMMON_DIRECTORY Общие OK WidgetAttributeText ОК Icon view VolumeWindow Большие значки @@ -256,7 +256,6 @@ TiB WidgetAttributeText ТБ The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Файл \"%name\" уже существует в указанной папке. Вы хотите заменить его? Cancel ContainerWindow Отмена Only the boot disk AutoMounterSettings Только загрузочный диск -Trash TrackerSettingsWindow Корзина If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Если вы %ifYouDoAction папку config, %osName может начать работать некорректно!\n\nВы уверены, что хотите сделать это? Unmount ContainerWindow Отключить Copy layout ContainerWindow Копировать вид папки diff --git a/data/catalogs/kits/tracker/sk.catkeys b/data/catalogs/kits/tracker/sk.catkeys index f91759f916..5aa3be445b 100644 --- a/data/catalogs/kits/tracker/sk.catkeys +++ b/data/catalogs/kits/tracker/sk.catkeys @@ -1,4 +1,4 @@ -1 slovak x-vnd.Haiku-libtracker 3081786474 +1 slovak x-vnd.Haiku-libtracker 3648639064 common B_COMMON_DIRECTORY spoločné OK WidgetAttributeText OK Icon view VolumeWindow Zobrazenie ikon @@ -255,7 +255,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Súbor „%name“ už existuje v uvedenom priečinku. Chcete ho nahradiť? Cancel ContainerWindow Zrušiť Only the boot disk AutoMounterSettings Iba zavádzací disk -Trash TrackerSettingsWindow Kôš If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Ak %ifYouDoAction priečinok „config“, %osName sa nemusí chovať správne!\n\nSte si istí, že to chcete urobiť? Unmount ContainerWindow Odpojiť Copy layout ContainerWindow Kopírovať rozloženie diff --git a/data/catalogs/kits/tracker/sv.catkeys b/data/catalogs/kits/tracker/sv.catkeys index 800168fb47..70c5d7e570 100644 --- a/data/catalogs/kits/tracker/sv.catkeys +++ b/data/catalogs/kits/tracker/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-libtracker 1610004061 +1 swedish x-vnd.Haiku-libtracker 4167158175 common B_COMMON_DIRECTORY gemensam OK WidgetAttributeText OK Icon view VolumeWindow Ikonvy @@ -74,6 +74,7 @@ Arrange by ContainerWindow Sortera efter Mount server error AutoMounterSettings Monteringsfel Search FindPanel Sök Preparing to empty Trash… StatusWindow Förbereder inför tömning av Papperskorgen... +You cannot put the selected item(s) into the trash. FSUtils Du kan inte lägga de valda objekten i papperskorgen. Disks Model Volymer Create link ContainerWindow Skapa länk develop B_COMMON_DEVELOP_DIRECTORY utvecklare @@ -81,7 +82,6 @@ Decrease size DeskWindow Minska storleken Size ContainerWindow Storlek All disks AutoMounterSettings Alla diskar Would you like to find some other suitable application? FSUtils Vill du söka efter ett annat program? -Ask before deleting for good SettingsView Fråga innan det tasbort permanent Finish: %time - %finishtime left StatusWindow Klar: %time - %finishtime kvar Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n FSUtils Kunde inte öppna "%document" med programmet "%app" (Saknar bibliotek: %library). \n no items CountView inga objekt @@ -102,7 +102,6 @@ New folder FilePanelPriv Ny mapp %name info InfoWindow InfoWindow Title %name information Favorites FavoritesMenu Favoriter Add-ons VolumeWindow Tillägg -Move deleted files to Trash first SettingsView Flytta borttagna filer till papperskorgen först Sorry, you can't copy items to the Trash. PoseView Du kan inte kopiera filer till Papperskorgen. List view VolumeWindow Listvy matches wildcard expression SelectionWindow matchar jokeruttryck @@ -258,7 +257,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Filen "%name" finns redan i den valda katalogen. Vill du ersätta den? Cancel ContainerWindow Avbryt Only the boot disk AutoMounterSettings Bara uppstartsdisken -Trash TrackerSettingsWindow Papperskorgen If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils Om du %ifYouDoAction config foldern, %osName kommer kanske inte att fungera som den ska!\n \n Är du säker på att du vill göra detta? Unmount ContainerWindow Avmontera Copy layout ContainerWindow Kopiera layout diff --git a/data/catalogs/kits/tracker/uk.catkeys b/data/catalogs/kits/tracker/uk.catkeys index bc362f5c6f..1eba4a2c1f 100644 --- a/data/catalogs/kits/tracker/uk.catkeys +++ b/data/catalogs/kits/tracker/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-libtracker 2533511185 +1 ukrainian x-vnd.Haiku-libtracker 3100363775 common B_COMMON_DIRECTORY common OK WidgetAttributeText Гаразд Icon view VolumeWindow У вигляді іконок @@ -244,7 +244,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv Файл \"%name\" вже існує в цій папці. Ви хочете його замінити? Cancel ContainerWindow Відміна Only the boot disk AutoMounterSettings Тільки загрузочний диск -Trash TrackerSettingsWindow Кошик Unmount ContainerWindow Відмонтувати Copy layout ContainerWindow Копіювати макет label too long PoseView Мітка занадто довга diff --git a/data/catalogs/kits/tracker/zh_Hans.catkeys b/data/catalogs/kits/tracker/zh_Hans.catkeys index cbc38b0317..bd63ac4602 100644 --- a/data/catalogs/kits/tracker/zh_Hans.catkeys +++ b/data/catalogs/kits/tracker/zh_Hans.catkeys @@ -1,4 +1,4 @@ -1 english x-vnd.Haiku-libtracker 2808668971 +1 english x-vnd.Haiku-libtracker 3375521561 common B_COMMON_DIRECTORY 常用 OK WidgetAttributeText 确定 Icon view VolumeWindow 图标视图 @@ -256,7 +256,6 @@ TiB WidgetAttributeText TiB The file \"%name\" already exists in the specified folder. Do you want to replace it? FilePanelPriv 指定目录中已经存在 \"%name\" 文件。您确定要将其替换吗？ Cancel ContainerWindow 取消 Only the boot disk AutoMounterSettings 仅引导磁盘 -Trash TrackerSettingsWindow 垃圾箱 If you %ifYouDoAction the config folder, %osName may not behave properly!\n\nAre you sure you want to do this? FSUtils 如果您 %ifYouDoAction config 目录, %osName 可能无法正常执行！\n\n您确定要执行此操作？ Unmount ContainerWindow 卸载 Copy layout ContainerWindow 复制布局 diff --git a/data/catalogs/preferences/keymap/ja.catkeys b/data/catalogs/preferences/keymap/ja.catkeys index 9436f10da0..c70df63540 100644 --- a/data/catalogs/preferences/keymap/ja.catkeys +++ b/data/catalogs/preferences/keymap/ja.catkeys @@ -5,7 +5,7 @@ Tilde trigger Keymap window チルダのトリガー Grave trigger Keymap window グレイヴアクセントのトリガー Role Modifier keys window As in the role of a modifier key 役割 Select dead keys Keymap window デッドキーの選択 -Cancel Modifier keys window キャンセル +Cancel Modifier keys window 中止 Quit Keymap window 終了 Switch shortcut keys to Haiku mode Keymap window ショートカットキースイッチを Haiku モードにする Circumflex trigger Keymap window サーカムフレックスのトリガー diff --git a/data/catalogs/preferences/notifications/de.catkeys b/data/catalogs/preferences/notifications/de.catkeys index cba26bab34..dd273206e4 100644 --- a/data/catalogs/preferences/notifications/de.catkeys +++ b/data/catalogs/preferences/notifications/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-Notifications 814394708 +1 german x-vnd.Haiku-Notifications 2177286129 An error occurred saving the preferences.\nIt's possible you are running out of disk space. GeneralView Beim Speichern der Einstellungen ist ein Fehler aufgetreten.\nVermutlich ist nicht mehr genügend Speicher auf dem Datenträger verfügbar. Notifications GeneralView Notifications - Benachrichtigungen seconds of inactivity GeneralView Sekunden Leerlauf. @@ -17,6 +17,7 @@ Cannot disable notifications because the server can't be reached. GeneralView B Progress NotificationView Fortschritt Last Received NotificationView Zuletzt empfangen General PrefletView Allgemein +Apply PrefletWin Anwenden Display PrefletView Darstellung Can't enable notifications at startup time, you probably don't have write permission to the boot settings directory. GeneralView Die Benachrichtigungen konnten nach dem Systemstart nicht aktiviert werden. Wahrscheinlich fehlt die Schreibberechtigung auf den settings-Ordner des Boot-Laufwerks. Search: NotificationView Suchen: diff --git a/data/catalogs/preferences/notifications/hu.catkeys b/data/catalogs/preferences/notifications/hu.catkeys index b765c3d7ff..3be0bf0ecb 100644 --- a/data/catalogs/preferences/notifications/hu.catkeys +++ b/data/catalogs/preferences/notifications/hu.catkeys @@ -1,4 +1,4 @@ -1 hungarian x-vnd.Haiku-Notifications 814394708 +1 hungarian x-vnd.Haiku-Notifications 2177286129 An error occurred saving the preferences.\nIt's possible you are running out of disk space. GeneralView Hiba történt a beállítások mentése során.\nLehet hogy elfogyott a hely a lemezen. Notifications GeneralView Értesítések seconds of inactivity GeneralView másodpercnyi inaktivitás után @@ -17,6 +17,7 @@ Cannot disable notifications because the server can't be reached. GeneralView N Progress NotificationView Folyamat Last Received NotificationView Legutóbbi fogadott General PrefletView Általános +Apply PrefletWin Alkalmaz Display PrefletView Kijelző Can't enable notifications at startup time, you probably don't have write permission to the boot settings directory. GeneralView Nem lehet engedélyezni az értesítéseket indításkor, valószínűleg nem rendelkezik írási jogosultságokkal a boot beállításmappájához. Search: NotificationView Keresés: diff --git a/data/catalogs/preferences/notifications/ja.catkeys b/data/catalogs/preferences/notifications/ja.catkeys index f69fda58e1..1c35a82abc 100644 --- a/data/catalogs/preferences/notifications/ja.catkeys +++ b/data/catalogs/preferences/notifications/ja.catkeys @@ -1,4 +1,4 @@ -1 japanese x-vnd.Haiku-Notifications 814394708 +1 japanese x-vnd.Haiku-Notifications 2177286129 An error occurred saving the preferences.\nIt's possible you are running out of disk space. GeneralView 設定ファイルの保存中にエラーが発生しました。\nおそらく、ディスク容量が不足しています。 Notifications GeneralView 通知 seconds of inactivity GeneralView 秒後に画面から隠されます。 @@ -17,6 +17,7 @@ Cannot disable notifications because the server can't be reached. GeneralView Progress NotificationView 進行状況 Last Received NotificationView 最終受信時刻 General PrefletView 一般設定 +Apply PrefletWin 適用 Display PrefletView 表示設定 Can't enable notifications at startup time, you probably don't have write permission to the boot settings directory. GeneralView 起動時に通知を有効にできませんでした。おそらく、boot settings ディレクトリの書き込み権限がありません。 Search: NotificationView 検索: diff --git a/data/catalogs/preferences/notifications/sv.catkeys b/data/catalogs/preferences/notifications/sv.catkeys index 49d3bbb0a8..d66c87055f 100644 --- a/data/catalogs/preferences/notifications/sv.catkeys +++ b/data/catalogs/preferences/notifications/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-Notifications 814394708 +1 swedish x-vnd.Haiku-Notifications 2177286129 An error occurred saving the preferences.\nIt's possible you are running out of disk space. GeneralView Ett fel uppstod när inställningarna skulle sparas.\nDet är möjligt att hårddiskutrymmet håller på att ta slut. Notifications GeneralView Aviseringar seconds of inactivity GeneralView sekunder av inaktivitet @@ -17,6 +17,7 @@ Cannot disable notifications because the server can't be reached. GeneralView K Progress NotificationView Progress Last Received NotificationView Sista mottagna General PrefletView Allmän +Apply PrefletWin Verkställ Display PrefletView Visa Can't enable notifications at startup time, you probably don't have write permission to the boot settings directory. GeneralView Kan inte aktivera aviseringar vid start. Du saknar förmodligen behörighet att skriva till startinställningsmappen. Search: NotificationView Sök: diff --git a/data/catalogs/preferences/sounds/ja.catkeys b/data/catalogs/preferences/sounds/ja.catkeys index 1aa4823af4..a9126c33dd 100644 --- a/data/catalogs/preferences/sounds/ja.catkeys +++ b/data/catalogs/preferences/sounds/ja.catkeys @@ -7,7 +7,7 @@ OK HEventList OK OK HWindow OK This is not an audio file. HWindow オーディオファイルではありません。 Stop HWindow 停止 -About Sounds SoundsHApp Soundsについて +About Sounds SoundsHApp サウンドについて Sound HEventList サウンド Event HEventList イベント HEventList <サウンド無し> diff --git a/data/catalogs/preferences/time/de.catkeys b/data/catalogs/preferences/time/de.catkeys index 8d3a1888d5..2249210b7d 100644 --- a/data/catalogs/preferences/time/de.catkeys +++ b/data/catalogs/preferences/time/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-Time 3544635877 +1 german x-vnd.Haiku-Time 3259467657 GMT (UNIX compatible) Time GMT (Unix-kompatibel) OK Time OK Asia Time Asien @@ -11,6 +11,7 @@ Preview time: Time Vorschau-Zeit: Synchronize Time Synchronisieren Revert Time Anfangswerte Pacific Time Pazifik +Show day of week Time Wochentag anzeigen Add Time Hinzu Date and time Time Datum und Zeit about Time über @@ -26,6 +27,7 @@ Time Time Time - Datum & Zeit Indian Time Indischer Ozean Sending request failed Time Sendeanfrage fehlgeschlagen Arctic Time Arktis +Display time with seconds Time Zeit sekundengenau anzeigen Time System name Datum & Zeit America Time Amerika Reset Time Reset @@ -33,6 +35,8 @@ Synchronize at boot Time Synchronisieren beim Hochfahren Time & Date, written by:\n\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2012, Haiku. Time Datum & Zeit\n\nvon\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2012, Haiku. Received invalid time Time Ungültige Zeit erhalten Antarctica Time Antarktis +Show time zone Time Zeitzone anzeigen +Show clock in Deskbar Time Uhr in Deskbar anzeigen The following error occured while synchronizing:r\n%s: %s Time Beim Synchronisieren trat folgender Fehler auf:r\n%s: %s Time Current time: Time Aktuelle Zeit: diff --git a/data/catalogs/preferences/time/hu.catkeys b/data/catalogs/preferences/time/hu.catkeys index 28747b0448..f21e7d5e8b 100644 --- a/data/catalogs/preferences/time/hu.catkeys +++ b/data/catalogs/preferences/time/hu.catkeys @@ -1,4 +1,4 @@ -1 hungarian x-vnd.Haiku-Time 3544635877 +1 hungarian x-vnd.Haiku-Time 3259467657 GMT (UNIX compatible) Time GMT (UNIX kompatibilis) OK Time Rendben Asia Time Ázsia @@ -11,6 +11,7 @@ Preview time: Time Idő előnézete: Synchronize Time Szinkronizálás Revert Time Visszaállít Pacific Time Csendes-óceán +Show day of week Time A hét napjának megjelenítése Add Time Hozzáadás Date and time Time Dátum és idő about Time névjegy @@ -26,6 +27,7 @@ Time Time Idő Indian Time India Sending request failed Time Sikertelen kérelemküldés Arctic Time Arktisz +Display time with seconds Time Másodpercek megjelenítése Time System name Dátum és idő America Time Amerika Reset Time Visszaállítás @@ -33,6 +35,8 @@ Synchronize at boot Time Szinkronizálás indításkor Time & Date, written by:\n\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2012, Haiku. Time Dátum és idő, készítette:\n\n\t Andrew Edward McCall\n\t Mike Berg\n\t Julun\n\t Philippe Saint-Pierre\n\n Copyright 2004-2012, Haiku. Received invalid time Time Érvénytelen idő érkezett Antarctica Time Antarktisz +Show time zone Time Időzóna megjelenítése +Show clock in Deskbar Time Óra az Asztalsávon The following error occured while synchronizing:r\n%s: %s Time A következő hiba történt szinkronizálás közben:r\n%s: %s Time Current time: Time Jelenlegi idő: diff --git a/data/catalogs/preferences/time/ja.catkeys b/data/catalogs/preferences/time/ja.catkeys index b561744790..46485ee0c1 100644 --- a/data/catalogs/preferences/time/ja.catkeys +++ b/data/catalogs/preferences/time/ja.catkeys @@ -1,4 +1,4 @@ -1 japanese x-vnd.Haiku-Time 3544635877 +1 japanese x-vnd.Haiku-Time 3259467657 GMT (UNIX compatible) Time GMT (UNIX 互換) OK Time OK Asia Time アジア @@ -11,6 +11,7 @@ Preview time: Time プレビュー： Synchronize Time 同期 Revert Time 元に戻す Pacific Time 太平洋 +Show day of week Time 曜日を表示 Add Time 追加 Date and time Time 日付と時間 about Time このソフトウェアについて @@ -26,6 +27,7 @@ Time Time 日付と時間 Indian Time インド Sending request failed Time リクエストの送信に失敗しました Arctic Time 北極 +Display time with seconds Time 秒を表示 Time System name 日付と時間 America Time アメリカ Reset Time リセット @@ -33,6 +35,8 @@ Synchronize at boot Time システム起動時に同期する Time & Date, written by:\n\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2012, Haiku. Time Time & Date 作者：\n\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2012, Haiku. Received invalid time Time 不正な時間を受け取りました Antarctica Time 南極 +Show time zone Time タイムゾーンを表示 +Show clock in Deskbar Time Deskbar に時計を表示 The following error occured while synchronizing:r\n%s: %s Time 同期中に次のエラーが発生しました\n%s: %s Time <その他> Current time: Time 現在時刻： diff --git a/data/catalogs/preferences/time/sv.catkeys b/data/catalogs/preferences/time/sv.catkeys index 255d06c46b..23c8e4d71c 100644 --- a/data/catalogs/preferences/time/sv.catkeys +++ b/data/catalogs/preferences/time/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-Time 3544635877 +1 swedish x-vnd.Haiku-Time 3259467657 GMT (UNIX compatible) Time GMT (UNIX kompatibel) OK Time OK Asia Time Asien @@ -11,6 +11,7 @@ Preview time: Time Förhandsvisa tid: Synchronize Time Synkronisera Revert Time Återställ Pacific Time Stilla havet +Show day of week Time Visa veckodag Add Time Lägg till Date and time Time Datum och tid about Time om @@ -26,6 +27,7 @@ Time Time Tid Indian Time Indien Sending request failed Time Misslyckades att skicka förfrågan Arctic Time Arktis +Display time with seconds Time Visa tid med sekunder Time System name Tid America Time Amerika Reset Time Återställ @@ -33,6 +35,8 @@ Synchronize at boot Time Synkronisera vid uppstart Time & Date, written by:\n\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2012, Haiku. Time Time & Date, Skriven av:\n\n\t Andrew Edward McCall\n\t Mike Berg\n\t Julun\n\t Philippe Saint-Pierre\n\nCopyright 2004-2012, Haiku. Received invalid time Time Tog emot en ogiltig tid Antarctica Time Antarktis +Show time zone Time Ange tidzon +Show clock in Deskbar Time Visa klockan i deskbaren The following error occured while synchronizing:r\n%s: %s Time Följande fel uppstod vid synkronisering:r\n%s: %s Time Current time: Time Aktuell tid: diff --git a/data/catalogs/servers/notification/ja.catkeys b/data/catalogs/servers/notification/ja.catkeys index 1c6f7c3004..5202be0e59 100644 --- a/data/catalogs/servers/notification/ja.catkeys +++ b/data/catalogs/servers/notification/ja.catkeys @@ -1,7 +1,7 @@ 1 japanese x-vnd.Haiku-notification_server 906000487 Couldn't start filter monitor. Live filter changes disabled. NotificationWindow フィルターモニターを開始できませんでした。フィルターのライブ変更は無効です。 Couldn't start display settings monitor.\nLive filter changes disabled. NotificationWindow 表示設定モニターを開始できませんでした。\nフィルタのライブ変更は無効です。 -Darn. NotificationWindow くそっ。 +Darn. NotificationWindow くそっ。 Warning NotificationWindow 警告 OK NotificationWindow OK Couldn't start general settings monitor.\nLive filter changes disabled. NotificationWindow 一般設定モニターを開始できませんでした。\nフィルタのライブ変更は無効です。 diff --git a/data/catalogs/servers/registrar/ja.catkeys b/data/catalogs/servers/registrar/ja.catkeys index cfcf3cc9b5..9b93e44f6b 100644 --- a/data/catalogs/servers/registrar/ja.catkeys +++ b/data/catalogs/servers/registrar/ja.catkeys @@ -4,7 +4,7 @@ The application \"%appName%\" might be blocked on a modal panel. ShutdownProcess OK ShutdownProcess OK System is shut down ShutdownProcess システムがシャットダウンされました It's now safe to turn off the computer. ShutdownProcess コンピューターの電源を切断しても安全です。 -Cancel ShutdownProcess キャンセル +Cancel ShutdownProcess 中止 Do you really want to shut down the system? ShutdownProcess 本当にシステムをシャットダウンしてよいですか? Asking other processes to quit. ShutdownProcess プロセスに終了を要求しています。 Asking \"%appName%\" to quit. ShutdownProcess \"%appName%\"に終了を要求しています。 diff --git a/data/catalogs/tests/servers/app/playground/ja.catkeys b/data/catalogs/tests/servers/app/playground/ja.catkeys index 1331e3ab36..fdd6d5df95 100644 --- a/data/catalogs/tests/servers/app/playground/ja.catkeys +++ b/data/catalogs/tests/servers/app/playground/ja.catkeys @@ -12,7 +12,7 @@ Alpha: Playground 不透明度: Mode: Playground 描画モード: Submenu Playground サブメニュー Copy Playground コピー -Cancel Playground キャンセル +Cancel Playground 中止 Clear Playground 消去 Blend Playground ブレンド Invert Playground 反転 From eede25d31f3f4ddf64433e4b5f2335bd948aad4b Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 16 Feb 2013 11:19:10 -0500 Subject: [PATCH 15/20] Make FirstBootPrompt write the settings immediately upon launch. If a user does not select anything, the default settings will be written. Part of #9427 --- src/apps/firstbootprompt/BootPromptWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/firstbootprompt/BootPromptWindow.cpp b/src/apps/firstbootprompt/BootPromptWindow.cpp index 113a7d7fcd..b819133c71 100644 --- a/src/apps/firstbootprompt/BootPromptWindow.cpp +++ b/src/apps/firstbootprompt/BootPromptWindow.cpp @@ -171,7 +171,7 @@ BootPromptWindow::BootPromptWindow() fKeymapsMenuField = new BMenuField("", "", new BMenu("")); fKeymapsMenuField->Menu()->SetLabelFromMarked(true); - _InitCatalog(false); + _InitCatalog(true); _PopulateLanguages(); _PopulateKeymaps(); From e4ba645c453ce75cca53c0deeaa4989d33c48958 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 16 Feb 2013 11:23:37 -0500 Subject: [PATCH 16/20] Changed the logic for launching FirstBootPrompt. Always launch on read only medium. Launch when the Locale settings file does not exist. Fixes #9427. --- data/system/boot/Bootscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript index a49439d831..4841b2d091 100644 --- a/data/system/boot/Bootscript +++ b/data/system/boot/Bootscript @@ -117,8 +117,8 @@ if [ "$SAFEMODE" != "yes" ]; then fi # Now ask the user if he wants to run the Installer or continue to the Desktop. -freshInstallIndicator=/boot/common/settings/fresh_install -if [ "$isReadOnly" = "yes" -o -e $freshInstallIndicator ]; then +localeSettings=/boot/home/config/settings/Locale\ settings +if [ "$isReadOnly" = "yes" -o ! -e "$localeSettings" ]; then /bin/FirstBootPrompt if [ $? -eq 0 ]; then launchscript $SCRIPTS/Bootscript.cd @@ -190,6 +190,7 @@ if [ "$SAFEMODE" != "yes" ]; then fi # Check for fresh install and run post install scripts. +freshInstallIndicator=/boot/common/settings/fresh_install postInstallDir=/boot/common/boot/post_install if [ -e $freshInstallIndicator ]; then # wait a moment for things to calm down a bit From f49d75c6a486176e1742c41104fe0187e92c0555 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 16 Feb 2013 13:59:14 -0500 Subject: [PATCH 17/20] Renamed file. No functional change. --- src/tools/stubgen/Example Usage.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/tools/stubgen/Example Usage.txt diff --git a/src/tools/stubgen/Example Usage.txt b/src/tools/stubgen/Example Usage.txt new file mode 100644 index 0000000000..402cfb83bc --- /dev/null +++ b/src/tools/stubgen/Example Usage.txt @@ -0,0 +1,3 @@ +Example usage for OpenBeOS project: + +stubgen -s -g -a *.h From 43b74aad598b98fc030ec8428cd73c8ae6cdeace Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 16 Feb 2013 13:59:39 -0500 Subject: [PATCH 18/20] s/OpenBeOS/Haiku --- src/tools/stubgen/Example Usage.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/stubgen/Example Usage.txt b/src/tools/stubgen/Example Usage.txt index 402cfb83bc..45780c9c28 100644 --- a/src/tools/stubgen/Example Usage.txt +++ b/src/tools/stubgen/Example Usage.txt @@ -1,3 +1,3 @@ -Example usage for OpenBeOS project: +Example usage for Haiku project: stubgen -s -g -a *.h From fbcd94bde7897b805121793203fc7c8a8d5b9168 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 16 Feb 2013 14:05:32 -0500 Subject: [PATCH 19/20] Automatic whitespace cleanup. No functional change. --- src/bin/clear.c | 2 +- src/bin/tty.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/clear.c b/src/bin/clear.c index 634002692a..eec2235801 100644 --- a/src/bin/clear.c +++ b/src/bin/clear.c @@ -2,7 +2,7 @@ // // Copyright (c) 2001-2003, OpenBeOS // -// This software is part of the OpenBeOS distribution and is covered +// This software is part of the OpenBeOS distribution and is covered // by the OpenBeOS license. // // diff --git a/src/bin/tty.c b/src/bin/tty.c index fdcdc6524c..06e576dc93 100644 --- a/src/bin/tty.c +++ b/src/bin/tty.c @@ -2,7 +2,7 @@ // // Copyright (c) 2001-2003, OpenBeOS // -// This software is part of the OpenBeOS distribution and is covered +// This software is part of the OpenBeOS distribution and is covered // by the OpenBeOS license. // // @@ -31,23 +31,23 @@ usage() int main(int argc, char *argv[]) { - + if (argc > 2) usage(); - + else { bool silent = false; - + if (argc == 2) { if (!strcmp(argv[1], "-s")) silent = true; else usage(); } - + if (!silent) printf("%s\n", ttyname(STDIN_FILENO)); } - + return (isatty(STDIN_FILENO) ? 0 : 1); } From 04c4314e15f25dbf34a7e64153b9e1463e52e942 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 16 Feb 2013 14:07:00 -0500 Subject: [PATCH 20/20] Rewrote copyright header. s/OpenBeOS/Haiku. Slight cleanup to included headers. --- src/bin/clear.c | 20 +++++++------------- src/bin/tty.c | 24 ++++++++++-------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/src/bin/clear.c b/src/bin/clear.c index eec2235801..f41db6422c 100644 --- a/src/bin/clear.c +++ b/src/bin/clear.c @@ -1,16 +1,10 @@ -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ -// -// Copyright (c) 2001-2003, OpenBeOS -// -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -// -// -// File: clear.c -// Author: Jan-Rixt Van Hoye (janvanhoye@pandora.be) -// Description: clears the terminal screen -// -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ +/* + * Copyright 2001-2013 Haiku, Inc. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Jan-Rixt Van Hoye, janvanhoye@pandora.be + */ #include diff --git a/src/bin/tty.c b/src/bin/tty.c index 06e576dc93..c892a99700 100644 --- a/src/bin/tty.c +++ b/src/bin/tty.c @@ -1,21 +1,17 @@ -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ -// -// Copyright (c) 2001-2003, OpenBeOS -// -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -// -// -// File: tty.c -// Author: Daniel Reinhold (danielre@users.sf.net) -// Description: prints the file name of the user's terminal -// -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ +/* + * Copyright 2001-2013 Haiku, Inc. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Daniel Reinhold, danielre@users.sf.net + */ + -#include #include #include +#include + void usage()