From 1210d96b97f54beeb18f6fe29dea9f497844c8ac Mon Sep 17 00:00:00 2001 From: BerkutEagle Date: Thu, 19 Jul 2018 16:40:31 +0500 Subject: [PATCH 01/13] Update Russian translation --- po/ru.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index 865f0032..40266b6c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,11 +13,11 @@ msgstr "Отключиться" #: src/Layouts/HeaderBar.vala:53 msgid "Light background" -msgstr "" +msgstr "Светлый фон" #: src/Layouts/HeaderBar.vala:54 msgid "Dark background" -msgstr "" +msgstr "Тёмный фон" #: src/Layouts/HeaderBar.vala:63 msgid "About" @@ -114,7 +114,7 @@ msgstr "Подключиться к базе данных и сохранить #: src/Layouts/Welcome.vala:39 msgid "Open a new Sequeler Window" -msgstr "" +msgstr "Открыть новое окно Sequeler" #: src/Layouts/Welcome.vala:40 msgid "Import Connections" @@ -158,20 +158,19 @@ msgstr "ТАБЛИЦЫ" #: src/Layouts/DataBaseView.vala:45 msgid "Structure" -msgstr "" +msgstr "Структура" #: src/Layouts/DataBaseView.vala:46 msgid "Content" -msgstr "" +msgstr "Данные" #: src/Layouts/DataBaseView.vala:47 msgid "Relations" -msgstr "" +msgstr "Отношения" #: src/Layouts/DataBaseView.vala:48 -#, fuzzy msgid "Query" -msgstr "Выполнить запрос" +msgstr "Запрос" #: src/Layouts/Views/Structure.vala:67 src/Layouts/Views/Structure.vala:101 #: src/Layouts/Views/Content.vala:67 src/Layouts/Views/Content.vala:101 From 3689f1bb1addca2cda62c0c681c15cb8ac89bead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 20:00:07 +0300 Subject: [PATCH 02/13] Translate to Turkish --- po/tr.po | 173 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 91 insertions(+), 82 deletions(-) diff --git a/po/tr.po b/po/tr.po index 7edbc7c9..c033f1b9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,342 +1,351 @@ +# +# Çağatay Yiğit Şahin , 2018. +# msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-07-17 09:17-0700\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Last-Translator: Çağatay Yiğit Şahin \n" +"Language-Team: Türkçe <>\n" +"Content-Transfer-Encoding: 8bit\n" +"PO-Revision-Date: 2018-07-24 19:32+0300\n" +"X-Generator: Gtranslator 2.91.7\n" #: src/Layouts/HeaderBar.vala:45 msgid "Logout" -msgstr "" +msgstr "Çıkış" #: src/Layouts/HeaderBar.vala:53 msgid "Light background" -msgstr "" +msgstr "Açık arka plan" #: src/Layouts/HeaderBar.vala:54 msgid "Dark background" -msgstr "" +msgstr "Koyu arka plan" #: src/Layouts/HeaderBar.vala:63 msgid "About" -msgstr "" +msgstr "Hakkında" #: src/Layouts/HeaderBar.vala:71 msgid "Report a Problem…" -msgstr "" +msgstr "Bir Problem Bildir…" #: src/Layouts/HeaderBar.vala:81 src/Layouts/Welcome.vala:39 msgid "New Window" -msgstr "" +msgstr "Yeni Pencere" #: src/Layouts/HeaderBar.vala:86 src/Widgets/ConnectionDialog.vala:100 #: src/Widgets/ConnectionDialog.vala:126 msgid "New Connection" -msgstr "" +msgstr "Yeni Bağlantı" #: src/Layouts/HeaderBar.vala:93 msgid "Quit" -msgstr "" +msgstr "Çık" #: src/Layouts/Main.vala:75 msgid "Connected to " -msgstr "" +msgstr "Bağlı " #: src/Layouts/Library.vala:44 msgid "SAVED CONNECTIONS" -msgstr "" +msgstr "KAYITLI BAĞLANTILAR" #: src/Layouts/Library.vala:49 msgid "Delete All" -msgstr "" +msgstr "Hepsini Sil" #: src/Layouts/Library.vala:56 msgid "Reload Library" -msgstr "" +msgstr "Kütüphaneyi Yeniden Yükle" #: src/Layouts/Library.vala:59 msgid "Export Library" -msgstr "" +msgstr "Kütüphaneyi Dışa Aktar" #: src/Layouts/Library.vala:134 src/Layouts/Library.vala:152 msgid "Are you sure you want to proceed?" -msgstr "" +msgstr "Devam etmek istediğinize emin misiniz?" #: src/Layouts/Library.vala:134 msgid "By deleting this connection you won't be able to recover this data." -msgstr "" +msgstr "Bu bağlantıyı silerek, bu veriyi kurtaramayacaksınız." #: src/Layouts/Library.vala:137 msgid "Yes, Delete!" -msgstr "" +msgstr "Evet, Sil!" #: src/Layouts/Library.vala:152 msgid "All the data will be deleted and you won't be able to recover it." -msgstr "" +msgstr "Tüm veri silinecek ve kurtarılamayacak." #: src/Layouts/Library.vala:155 msgid "Yes, Delete All!" -msgstr "" +msgstr "Evet, Hepsini Sil!" #: src/Layouts/Library.vala:240 src/Layouts/Welcome.vala:61 msgid "_Cancel" -msgstr "" +msgstr "_İptal Et" #: src/Layouts/Library.vala:242 msgid "_Save" -msgstr "" +msgstr "_Kaydet" #: src/Layouts/Library.vala:302 msgid "Unable to Connect to " -msgstr "" +msgstr "Bağlanılamadı " #: src/Layouts/Library.vala:315 msgid "Unable to Export Library " -msgstr "" +msgstr "Kütüphane Dışa Aktarılamadı" #: src/Layouts/Welcome.vala:28 msgid "Welcome to Sequeler" -msgstr "" +msgstr "Sequeler‘a Hoş Geldiniz" #: src/Layouts/Welcome.vala:29 msgid "Connect to any Local or Remote Database." -msgstr "" +msgstr "Herhangi Bir Yerel veya Uzak Veri Tabanına Bağlan." #: src/Layouts/Welcome.vala:38 msgid "Add a New Database" -msgstr "" +msgstr "Yeni Bir Veri Tabanı Ekle" #: src/Layouts/Welcome.vala:38 msgid "Connect to a Database and Save it in your Library" -msgstr "" +msgstr "Bir Veri Tabanına Bağlan ve Kütüphanene Kaydet" #: src/Layouts/Welcome.vala:39 msgid "Open a new Sequeler Window" -msgstr "" +msgstr "Yeni bir Sequeler Penceresi Aç" #: src/Layouts/Welcome.vala:40 msgid "Import Connections" -msgstr "" +msgstr "Bağlantıları İçe Aktar" #: src/Layouts/Welcome.vala:40 msgid "Import Previously Exported Sequeler Connections" -msgstr "" +msgstr "Önceden Dışa Aktarılmış Sequeler Bağlantılarını İçe Aktar" #: src/Layouts/Welcome.vala:63 msgid "_Open" -msgstr "" +msgstr "_Aç" #: src/Layouts/Welcome.vala:108 msgid "Unable to Import Library " -msgstr "" +msgstr "Kütüphane İçe Aktarılamadı" #: src/Layouts/DataBaseSchema.vala:64 src/Layouts/DataBaseSchema.vala:145 msgid "- Select Database -" -msgstr "" +msgstr "- Veri Tabanı Seç -" #: src/Layouts/DataBaseSchema.vala:84 msgid "Search Tables" -msgstr "" +msgstr "Tabloları Ara" #: src/Layouts/DataBaseSchema.vala:95 msgid "Search Tables…" -msgstr "" +msgstr "Tabloları Ara…" #: src/Layouts/DataBaseSchema.vala:117 msgid "Reload Tables" -msgstr "" +msgstr "Tabloları Yeniden Yükle" #: src/Layouts/DataBaseSchema.vala:122 msgid "Add Table" -msgstr "" +msgstr "Tablo Ekle" #: src/Layouts/DataBaseSchema.vala:250 msgid "TABLES" -msgstr "" +msgstr "TABLOLAR" #: src/Layouts/DataBaseView.vala:45 msgid "Structure" -msgstr "" +msgstr "Yapı" #: src/Layouts/DataBaseView.vala:46 msgid "Content" -msgstr "" +msgstr "İçerik" #: src/Layouts/DataBaseView.vala:47 msgid "Relations" -msgstr "" +msgstr "İlişkiler" #: src/Layouts/DataBaseView.vala:48 msgid "Query" -msgstr "" +msgstr "Sorgu" #: src/Layouts/Views/Structure.vala:67 src/Layouts/Views/Structure.vala:101 #: src/Layouts/Views/Content.vala:67 src/Layouts/Views/Content.vala:101 #: src/Layouts/Views/Relations.vala:67 src/Layouts/Views/Relations.vala:101 #: src/Layouts/Views/Query.vala:158 msgid "No Results Available" -msgstr "" +msgstr "Sonuç Yok" #: src/Layouts/Views/Structure.vala:78 src/Layouts/Views/Content.vala:78 #: src/Layouts/Views/Relations.vala:78 msgid "Reload Results" -msgstr "" +msgstr "Sonuçları Yeniden Yükle" #: src/Layouts/Views/Structure.vala:86 src/Layouts/Views/Content.vala:86 #: src/Layouts/Views/Relations.vala:86 msgid "Select Table" -msgstr "" +msgstr "Tablo Seç" #: src/Layouts/Views/Structure.vala:86 src/Layouts/Views/Content.vala:86 #: src/Layouts/Views/Relations.vala:86 msgid "Select a table from the left sidebar to activate this view." msgstr "" +"Bu görünümü etkinleştirmek için soldaki kenar çubuğundan bir tablo seç." #: src/Layouts/Views/Structure.vala:128 src/Layouts/Views/Structure.vala:150 msgid " Fields" -msgstr "" +msgstr " Alanlar" #: src/Layouts/Views/Content.vala:128 src/Layouts/Views/Content.vala:150 msgid " Entries" -msgstr "" +msgstr " Girdiler" #: src/Layouts/Views/Relations.vala:128 src/Layouts/Views/Relations.vala:150 msgid " Constraints" -msgstr "" +msgstr " Kısıtlar" #: src/Layouts/Views/Query.vala:126 msgid "Running Query…" -msgstr "" +msgstr "Sorgu Çalıştırılıyor…" #: src/Layouts/Views/Query.vala:143 msgid "Run Query" -msgstr "" +msgstr "Sorguyu Çalıştır" #: src/Layouts/Views/Query.vala:171 msgid "Export Results" -msgstr "" +msgstr "Sonuçları Dışa Aktar" #: src/Layouts/Views/Query.vala:178 msgid "Export as Sql" -msgstr "" +msgstr "Sql Olarak Dışa Aktar" #: src/Layouts/Views/Query.vala:179 msgid "Export as Csv" -msgstr "" +msgstr "Csv Olarak Dışa Aktar" #: src/Layouts/Views/Query.vala:180 msgid "Export as Text" -msgstr "" +msgstr "Metin Olarak Dışa Aktar" #: src/Layouts/Views/Query.vala:268 src/Layouts/Views/Query.vala:302 msgid "Unable to process Query!" -msgstr "" +msgstr "Sorgu işlenemedi!" #: src/Layouts/Views/Query.vala:281 msgid " Total Results" -msgstr "" +msgstr " Toplam Sonuç" #: src/Layouts/Views/Query.vala:307 msgid "Query Successfully Executed! Rows affected: " -msgstr "" +msgstr "Sorgu Başarıyla Çalıştırıldı! Etkilenen satırlar: " #: src/Layouts/Views/Query.vala:309 msgid "Query Executed!" -msgstr "" +msgstr "Sorgu Çalıştırıldı!" #: src/Partials/LibraryItem.vala:76 src/Widgets/ConnectionDialog.vala:227 msgid "Connect" -msgstr "" +msgstr "Bağlan" #: src/Partials/LibraryItem.vala:79 msgid "Edit Connection" -msgstr "" +msgstr "Bağlantıyı Düzenle" #: src/Partials/LibraryItem.vala:84 msgid "Delete Connection" -msgstr "" +msgstr "Bağlantıyı Sil" #: src/Services/ConnectionManager.vala:189 msgid "Error!" -msgstr "" +msgstr "Hata!" #: src/Widgets/ConnectionDialog.vala:61 msgid "Connection" -msgstr "" +msgstr "Bağlantı" #: src/Widgets/ConnectionDialog.vala:125 msgid "Connection Name:" -msgstr "" +msgstr "Bağlantı Adı:" #: src/Widgets/ConnectionDialog.vala:126 msgid "Connection's name" -msgstr "" +msgstr "Bağlantının adı" #: src/Widgets/ConnectionDialog.vala:133 msgid "Database Type:" -msgstr "" +msgstr "Veri Tabanı Türü:" #: src/Widgets/ConnectionDialog.vala:155 msgid "Host:" -msgstr "" +msgstr "Ana Makine:" #: src/Widgets/ConnectionDialog.vala:156 msgid "127.0.0.1" -msgstr "" +msgstr "127.0.0.1" #: src/Widgets/ConnectionDialog.vala:161 msgid "Database Name:" -msgstr "" +msgstr "Veri Tabanı Adı:" #: src/Widgets/ConnectionDialog.vala:168 msgid "Username:" -msgstr "" +msgstr "Kullanıcı Adı:" #: src/Widgets/ConnectionDialog.vala:174 msgid "Password:" -msgstr "" +msgstr "Parola:" #: src/Widgets/ConnectionDialog.vala:187 msgid "Port:" -msgstr "" +msgstr "Bağlantı Kapısı:" #: src/Widgets/ConnectionDialog.vala:193 msgid "File Path:" -msgstr "" +msgstr "Dosya Yolu:" #: src/Widgets/ConnectionDialog.vala:194 msgid "Select your SQLite File…" -msgstr "" +msgstr "SQLite Dosyanı Seç…" #: src/Widgets/ConnectionDialog.vala:221 msgid "Close" -msgstr "" +msgstr "Kapat" #: src/Widgets/ConnectionDialog.vala:222 msgid "Save Connection" -msgstr "" +msgstr "Bağlantıyı Kaydet" #: src/Widgets/ConnectionDialog.vala:224 msgid "Test Connection" -msgstr "" +msgstr "Bağlantıyı Sına" #: src/Widgets/ConnectionDialog.vala:364 msgid "Testing Connection…" -msgstr "" +msgstr "Bağlantı Sınanıyor…" #: src/Widgets/ConnectionDialog.vala:372 msgid "Successfully Connected!" -msgstr "" +msgstr "Bağlantı Başarılı!" #: src/Widgets/ConnectionDialog.vala:389 msgid "Saving Connection…" -msgstr "" +msgstr "Bağlantı Kaydediliyor…" #: src/Widgets/ConnectionDialog.vala:394 msgid "Connection Saved!" -msgstr "" +msgstr "Bağlantı Kaydedildi!" #: src/Widgets/ConnectionDialog.vala:402 msgid "Connecting…" -msgstr "" +msgstr "Bağlanıyor…" From 1ae00cc661fa6ab8b5f45ec7fa49150be707d3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:15:12 +0300 Subject: [PATCH 03/13] Mark IP address as untranslatable --- src/Widgets/ConnectionDialog.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widgets/ConnectionDialog.vala b/src/Widgets/ConnectionDialog.vala index 076595cd..365d6d44 100644 --- a/src/Widgets/ConnectionDialog.vala +++ b/src/Widgets/ConnectionDialog.vala @@ -153,7 +153,7 @@ public class Sequeler.Widgets.ConnectionDialog : Gtk.Dialog { form_grid.attach (db_type_entry, 1, 1, 1, 1); db_host_label = new Sequeler.Partials.LabelForm (_("Host:")); - db_host_entry = new Sequeler.Partials.Entry (_("127.0.0.1"), null); + db_host_entry = new Sequeler.Partials.Entry ("127.0.0.1", null); form_grid.attach (db_host_label, 0, 2, 1, 1); form_grid.attach (db_host_entry, 1, 2, 1, 1); From b0adb1f9415b21d3f4cd80abeece774169e0f492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:18:01 +0300 Subject: [PATCH 04/13] Capitalize abbreviations --- src/Layouts/Views/Query.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Layouts/Views/Query.vala b/src/Layouts/Views/Query.vala index 8e4537c2..a4974eaa 100644 --- a/src/Layouts/Views/Query.vala +++ b/src/Layouts/Views/Query.vala @@ -175,8 +175,8 @@ public class Sequeler.Layouts.Views.Query : Gtk.Grid { export_button.can_focus = false; var export_menu = new Gtk.Menu (); - var export_sql = new Gtk.MenuItem.with_label (_("Export as Sql")); - var export_csv = new Gtk.MenuItem.with_label (_("Export as Csv")); + var export_sql = new Gtk.MenuItem.with_label (_("Export as SQL")); + var export_csv = new Gtk.MenuItem.with_label (_("Export as CSV")); var export_text = new Gtk.MenuItem.with_label (_("Export as Text")); export_menu.add (export_sql); export_menu.add (export_csv); From 160de94affb2910f4596e692138ecd4ff6ccaf79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:19:18 +0300 Subject: [PATCH 05/13] Use correct Unicode character for apostrophe --- src/Layouts/Library.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Layouts/Library.vala b/src/Layouts/Library.vala index 240f13bc..2a6fd4c2 100644 --- a/src/Layouts/Library.vala +++ b/src/Layouts/Library.vala @@ -131,7 +131,7 @@ public class Sequeler.Layouts.Library : Gtk.Grid { } public void confirm_delete (Gtk.FlowBoxChild item, Gee.HashMap data) { - var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Are you sure you want to proceed?"), _("By deleting this connection you won't be able to recover this data."), "dialog-warning", Gtk.ButtonsType.CANCEL); + var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Are you sure you want to proceed?"), _("By deleting this connection you won’t be able to recover this data."), "dialog-warning", Gtk.ButtonsType.CANCEL); message_dialog.transient_for = window; var suggested_button = new Gtk.Button.with_label (_("Yes, Delete!")); @@ -149,7 +149,7 @@ public class Sequeler.Layouts.Library : Gtk.Grid { } public void confirm_delete_all () { - var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Are you sure you want to proceed?"), _("All the data will be deleted and you won't be able to recover it."), "dialog-warning", Gtk.ButtonsType.CANCEL); + var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Are you sure you want to proceed?"), _("All the data will be deleted and you won’t be able to recover it."), "dialog-warning", Gtk.ButtonsType.CANCEL); message_dialog.transient_for = window; var suggested_button = new Gtk.Button.with_label (_("Yes, Delete All!")); From 787ce668595cdf26a985d1d21d678431d4e55d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:25:05 +0300 Subject: [PATCH 06/13] Use format strings instead of concatenation Different languages may have different orders for words. It is safer to use a format string for translations. --- src/Layouts/Library.vala | 2 +- src/Layouts/Main.vala | 2 +- src/Layouts/Views/Content.vala | 2 +- src/Layouts/Views/Query.vala | 2 +- src/Layouts/Views/Relations.vala | 2 +- src/Layouts/Views/Structure.vala | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Layouts/Library.vala b/src/Layouts/Library.vala index 2a6fd4c2..0a308039 100644 --- a/src/Layouts/Library.vala +++ b/src/Layouts/Library.vala @@ -299,7 +299,7 @@ public class Sequeler.Layouts.Library : Gtk.Grid { } private void connection_warning (string message, string title) { - var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Unable to Connect to ") + title + "", message, "dialog-error", Gtk.ButtonsType.NONE); + var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Unable to Connect to %s").printf (title), message, "dialog-error", Gtk.ButtonsType.NONE); message_dialog.transient_for = window; var suggested_button = new Gtk.Button.with_label ("Close"); diff --git a/src/Layouts/Main.vala b/src/Layouts/Main.vala index 709a01ff..cdec6255 100644 --- a/src/Layouts/Main.vala +++ b/src/Layouts/Main.vala @@ -72,7 +72,7 @@ public class Sequeler.Layouts.Main : Gtk.Paned { main_stack.set_visible_child_full ("database_view", Gtk.StackTransitionType.SLIDE_LEFT); var host = connection.data["host"] != "" ? connection.data["host"] : "127.0.0.1"; - window.headerbar.title = _("Connected to ") + connection.data["title"]; + window.headerbar.title = _("Connected to %s").printf (connection.data["title"]); window.headerbar.subtitle = connection.data["username"] + "@" + host; database_schema.reload_schema (); diff --git a/src/Layouts/Views/Content.vala b/src/Layouts/Views/Content.vala index 105d3a41..b5be3e7f 100644 --- a/src/Layouts/Views/Content.vala +++ b/src/Layouts/Views/Content.vala @@ -125,7 +125,7 @@ public class Sequeler.Layouts.Views.Content : Gtk.Grid { } var result_data = new Sequeler.Partials.TreeBuilder (table_content, window); - result_message.label = table_content.get_n_rows ().to_string () + _(" Entries"); + result_message.label = _("%d Entries").printf (table_content.get_n_rows ()); clear (); diff --git a/src/Layouts/Views/Query.vala b/src/Layouts/Views/Query.vala index a4974eaa..a2410983 100644 --- a/src/Layouts/Views/Query.vala +++ b/src/Layouts/Views/Query.vala @@ -278,7 +278,7 @@ public class Sequeler.Layouts.Views.Query : Gtk.Grid { toggle_loading_msg (false); spinner.stop (); - result_message.label = response.get_n_rows ().to_string () + _(" Total Results"); + result_message.label = _("%d Total Results").printf (response.get_n_rows ()); scroll_results.add (result_data); scroll_results.show_all (); diff --git a/src/Layouts/Views/Relations.vala b/src/Layouts/Views/Relations.vala index 6741f413..f2d83a8d 100644 --- a/src/Layouts/Views/Relations.vala +++ b/src/Layouts/Views/Relations.vala @@ -125,7 +125,7 @@ public class Sequeler.Layouts.Views.Relations : Gtk.Grid { } var result_data = new Sequeler.Partials.TreeBuilder (table_relations, window); - result_message.label = table_relations.get_n_rows ().to_string () + _(" Constraints"); + result_message.label = _("%d Constraints").printf (table_relations.get_n_rows ()); clear (); diff --git a/src/Layouts/Views/Structure.vala b/src/Layouts/Views/Structure.vala index 7a4e1041..f4bfbca5 100644 --- a/src/Layouts/Views/Structure.vala +++ b/src/Layouts/Views/Structure.vala @@ -125,7 +125,7 @@ public class Sequeler.Layouts.Views.Structure : Gtk.Grid { } var result_data = new Sequeler.Partials.TreeBuilder (table_schema, window); - result_message.label = table_schema.get_n_rows ().to_string () + _(" Fields"); + result_message.label = _("%d Fields").printf (table_schema.get_n_rows ()); clear (); From 373eb0d251de93012c14ad00a0e4066dcebb07b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:38:47 +0300 Subject: [PATCH 07/13] Title capitalize consistently --- src/Layouts/Views/Query.vala | 2 +- src/Layouts/Welcome.vala | 6 +++--- src/Widgets/ConnectionDialog.vala | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Layouts/Views/Query.vala b/src/Layouts/Views/Query.vala index a2410983..5bf07dc0 100644 --- a/src/Layouts/Views/Query.vala +++ b/src/Layouts/Views/Query.vala @@ -304,7 +304,7 @@ public class Sequeler.Layouts.Views.Query : Gtk.Grid { } if (response > 0) { - result_message.label = _("Query Successfully Executed! Rows affected: ") + response.to_string (); + result_message.label = _("Query Successfully Executed! Rows Affected: ") + response.to_string (); } else { result_message.label = _("Query Executed!"); } diff --git a/src/Layouts/Welcome.vala b/src/Layouts/Welcome.vala index 1e7ea2c0..52fcecde 100644 --- a/src/Layouts/Welcome.vala +++ b/src/Layouts/Welcome.vala @@ -26,7 +26,7 @@ public class Sequeler.Layouts.Welcome : Granite.Widgets.Welcome { Object ( window: main_window, title: _("Welcome to Sequeler"), - subtitle: _("Connect to any Local or Remote Database.") + subtitle: _("Connect to Any Local or Remote Database.") ); } @@ -35,8 +35,8 @@ public class Sequeler.Layouts.Welcome : Granite.Widgets.Welcome { halign = Gtk.Align.FILL; vexpand = true; - append ("bookmark-new", _("Add a New Database"), _("Connect to a Database and Save it in your Library")); - append ("window-new", _("New Window"), _("Open a new Sequeler Window")); + append ("bookmark-new", _("Add a New Database"), _("Connect to a Database and Save It in Your Library")); + append ("window-new", _("New Window"), _("Open a New Sequeler Window")); append ("folder-download", _("Import Connections"), _("Import Previously Exported Sequeler Connections")); activated.connect ( index => { diff --git a/src/Widgets/ConnectionDialog.vala b/src/Widgets/ConnectionDialog.vala index 365d6d44..00a936a5 100644 --- a/src/Widgets/ConnectionDialog.vala +++ b/src/Widgets/ConnectionDialog.vala @@ -191,7 +191,7 @@ public class Sequeler.Widgets.ConnectionDialog : Gtk.Dialog { form_grid.attach (db_port_entry, 1, 6, 1, 1); db_file_label = new Sequeler.Partials.LabelForm (_("File Path:")); - db_file_entry = new Gtk.FileChooserButton (_("Select your SQLite File\u2026"), Gtk.FileChooserAction.OPEN); + db_file_entry = new Gtk.FileChooserButton (_("Select Your SQLite File\u2026"), Gtk.FileChooserAction.OPEN); var filter = new Gtk.FileFilter (); filter.set_filter_name ("Database File"); filter.add_pattern ("*.db"); From ddf394ca677bc0c019042e9f67d5608c99443309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:15:12 +0300 Subject: [PATCH 08/13] Mark IP address as untranslatable --- src/Widgets/ConnectionDialog.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widgets/ConnectionDialog.vala b/src/Widgets/ConnectionDialog.vala index 076595cd..365d6d44 100644 --- a/src/Widgets/ConnectionDialog.vala +++ b/src/Widgets/ConnectionDialog.vala @@ -153,7 +153,7 @@ public class Sequeler.Widgets.ConnectionDialog : Gtk.Dialog { form_grid.attach (db_type_entry, 1, 1, 1, 1); db_host_label = new Sequeler.Partials.LabelForm (_("Host:")); - db_host_entry = new Sequeler.Partials.Entry (_("127.0.0.1"), null); + db_host_entry = new Sequeler.Partials.Entry ("127.0.0.1", null); form_grid.attach (db_host_label, 0, 2, 1, 1); form_grid.attach (db_host_entry, 1, 2, 1, 1); From 44abe311d8d56c55251978ac21190aa72a48b2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:18:01 +0300 Subject: [PATCH 09/13] Capitalize abbreviations --- src/Layouts/Views/Query.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Layouts/Views/Query.vala b/src/Layouts/Views/Query.vala index 8e4537c2..a4974eaa 100644 --- a/src/Layouts/Views/Query.vala +++ b/src/Layouts/Views/Query.vala @@ -175,8 +175,8 @@ public class Sequeler.Layouts.Views.Query : Gtk.Grid { export_button.can_focus = false; var export_menu = new Gtk.Menu (); - var export_sql = new Gtk.MenuItem.with_label (_("Export as Sql")); - var export_csv = new Gtk.MenuItem.with_label (_("Export as Csv")); + var export_sql = new Gtk.MenuItem.with_label (_("Export as SQL")); + var export_csv = new Gtk.MenuItem.with_label (_("Export as CSV")); var export_text = new Gtk.MenuItem.with_label (_("Export as Text")); export_menu.add (export_sql); export_menu.add (export_csv); From 09bca9538b6fcab24716b6f789ff0b7eb2067938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:19:18 +0300 Subject: [PATCH 10/13] Use correct Unicode character for apostrophe --- src/Layouts/Library.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Layouts/Library.vala b/src/Layouts/Library.vala index 240f13bc..2a6fd4c2 100644 --- a/src/Layouts/Library.vala +++ b/src/Layouts/Library.vala @@ -131,7 +131,7 @@ public class Sequeler.Layouts.Library : Gtk.Grid { } public void confirm_delete (Gtk.FlowBoxChild item, Gee.HashMap data) { - var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Are you sure you want to proceed?"), _("By deleting this connection you won't be able to recover this data."), "dialog-warning", Gtk.ButtonsType.CANCEL); + var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Are you sure you want to proceed?"), _("By deleting this connection you won’t be able to recover this data."), "dialog-warning", Gtk.ButtonsType.CANCEL); message_dialog.transient_for = window; var suggested_button = new Gtk.Button.with_label (_("Yes, Delete!")); @@ -149,7 +149,7 @@ public class Sequeler.Layouts.Library : Gtk.Grid { } public void confirm_delete_all () { - var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Are you sure you want to proceed?"), _("All the data will be deleted and you won't be able to recover it."), "dialog-warning", Gtk.ButtonsType.CANCEL); + var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Are you sure you want to proceed?"), _("All the data will be deleted and you won’t be able to recover it."), "dialog-warning", Gtk.ButtonsType.CANCEL); message_dialog.transient_for = window; var suggested_button = new Gtk.Button.with_label (_("Yes, Delete All!")); From 4da93a84036dc0f1500bce8ebb06672c7280f6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:25:05 +0300 Subject: [PATCH 11/13] Use format strings instead of concatenation Different languages may have different orders for words. It is safer to use a format string for translations. --- src/Layouts/Library.vala | 2 +- src/Layouts/Main.vala | 2 +- src/Layouts/Views/Content.vala | 2 +- src/Layouts/Views/Query.vala | 2 +- src/Layouts/Views/Relations.vala | 2 +- src/Layouts/Views/Structure.vala | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Layouts/Library.vala b/src/Layouts/Library.vala index 2a6fd4c2..0a308039 100644 --- a/src/Layouts/Library.vala +++ b/src/Layouts/Library.vala @@ -299,7 +299,7 @@ public class Sequeler.Layouts.Library : Gtk.Grid { } private void connection_warning (string message, string title) { - var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Unable to Connect to ") + title + "", message, "dialog-error", Gtk.ButtonsType.NONE); + var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("Unable to Connect to %s").printf (title), message, "dialog-error", Gtk.ButtonsType.NONE); message_dialog.transient_for = window; var suggested_button = new Gtk.Button.with_label ("Close"); diff --git a/src/Layouts/Main.vala b/src/Layouts/Main.vala index 709a01ff..cdec6255 100644 --- a/src/Layouts/Main.vala +++ b/src/Layouts/Main.vala @@ -72,7 +72,7 @@ public class Sequeler.Layouts.Main : Gtk.Paned { main_stack.set_visible_child_full ("database_view", Gtk.StackTransitionType.SLIDE_LEFT); var host = connection.data["host"] != "" ? connection.data["host"] : "127.0.0.1"; - window.headerbar.title = _("Connected to ") + connection.data["title"]; + window.headerbar.title = _("Connected to %s").printf (connection.data["title"]); window.headerbar.subtitle = connection.data["username"] + "@" + host; database_schema.reload_schema (); diff --git a/src/Layouts/Views/Content.vala b/src/Layouts/Views/Content.vala index 105d3a41..b5be3e7f 100644 --- a/src/Layouts/Views/Content.vala +++ b/src/Layouts/Views/Content.vala @@ -125,7 +125,7 @@ public class Sequeler.Layouts.Views.Content : Gtk.Grid { } var result_data = new Sequeler.Partials.TreeBuilder (table_content, window); - result_message.label = table_content.get_n_rows ().to_string () + _(" Entries"); + result_message.label = _("%d Entries").printf (table_content.get_n_rows ()); clear (); diff --git a/src/Layouts/Views/Query.vala b/src/Layouts/Views/Query.vala index a4974eaa..a2410983 100644 --- a/src/Layouts/Views/Query.vala +++ b/src/Layouts/Views/Query.vala @@ -278,7 +278,7 @@ public class Sequeler.Layouts.Views.Query : Gtk.Grid { toggle_loading_msg (false); spinner.stop (); - result_message.label = response.get_n_rows ().to_string () + _(" Total Results"); + result_message.label = _("%d Total Results").printf (response.get_n_rows ()); scroll_results.add (result_data); scroll_results.show_all (); diff --git a/src/Layouts/Views/Relations.vala b/src/Layouts/Views/Relations.vala index 6741f413..f2d83a8d 100644 --- a/src/Layouts/Views/Relations.vala +++ b/src/Layouts/Views/Relations.vala @@ -125,7 +125,7 @@ public class Sequeler.Layouts.Views.Relations : Gtk.Grid { } var result_data = new Sequeler.Partials.TreeBuilder (table_relations, window); - result_message.label = table_relations.get_n_rows ().to_string () + _(" Constraints"); + result_message.label = _("%d Constraints").printf (table_relations.get_n_rows ()); clear (); diff --git a/src/Layouts/Views/Structure.vala b/src/Layouts/Views/Structure.vala index 7a4e1041..f4bfbca5 100644 --- a/src/Layouts/Views/Structure.vala +++ b/src/Layouts/Views/Structure.vala @@ -125,7 +125,7 @@ public class Sequeler.Layouts.Views.Structure : Gtk.Grid { } var result_data = new Sequeler.Partials.TreeBuilder (table_schema, window); - result_message.label = table_schema.get_n_rows ().to_string () + _(" Fields"); + result_message.label = _("%d Fields").printf (table_schema.get_n_rows ()); clear (); From 401eef4bd18da79e27ad095ad2174be39a69483b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Yi=C4=9Fit=20=C5=9Eahin?= Date: Tue, 24 Jul 2018 21:38:47 +0300 Subject: [PATCH 12/13] Title capitalize consistently --- src/Layouts/Views/Query.vala | 2 +- src/Layouts/Welcome.vala | 6 +++--- src/Widgets/ConnectionDialog.vala | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Layouts/Views/Query.vala b/src/Layouts/Views/Query.vala index a2410983..5bf07dc0 100644 --- a/src/Layouts/Views/Query.vala +++ b/src/Layouts/Views/Query.vala @@ -304,7 +304,7 @@ public class Sequeler.Layouts.Views.Query : Gtk.Grid { } if (response > 0) { - result_message.label = _("Query Successfully Executed! Rows affected: ") + response.to_string (); + result_message.label = _("Query Successfully Executed! Rows Affected: ") + response.to_string (); } else { result_message.label = _("Query Executed!"); } diff --git a/src/Layouts/Welcome.vala b/src/Layouts/Welcome.vala index 1e7ea2c0..52fcecde 100644 --- a/src/Layouts/Welcome.vala +++ b/src/Layouts/Welcome.vala @@ -26,7 +26,7 @@ public class Sequeler.Layouts.Welcome : Granite.Widgets.Welcome { Object ( window: main_window, title: _("Welcome to Sequeler"), - subtitle: _("Connect to any Local or Remote Database.") + subtitle: _("Connect to Any Local or Remote Database.") ); } @@ -35,8 +35,8 @@ public class Sequeler.Layouts.Welcome : Granite.Widgets.Welcome { halign = Gtk.Align.FILL; vexpand = true; - append ("bookmark-new", _("Add a New Database"), _("Connect to a Database and Save it in your Library")); - append ("window-new", _("New Window"), _("Open a new Sequeler Window")); + append ("bookmark-new", _("Add a New Database"), _("Connect to a Database and Save It in Your Library")); + append ("window-new", _("New Window"), _("Open a New Sequeler Window")); append ("folder-download", _("Import Connections"), _("Import Previously Exported Sequeler Connections")); activated.connect ( index => { diff --git a/src/Widgets/ConnectionDialog.vala b/src/Widgets/ConnectionDialog.vala index 365d6d44..00a936a5 100644 --- a/src/Widgets/ConnectionDialog.vala +++ b/src/Widgets/ConnectionDialog.vala @@ -191,7 +191,7 @@ public class Sequeler.Widgets.ConnectionDialog : Gtk.Dialog { form_grid.attach (db_port_entry, 1, 6, 1, 1); db_file_label = new Sequeler.Partials.LabelForm (_("File Path:")); - db_file_entry = new Gtk.FileChooserButton (_("Select your SQLite File\u2026"), Gtk.FileChooserAction.OPEN); + db_file_entry = new Gtk.FileChooserButton (_("Select Your SQLite File\u2026"), Gtk.FileChooserAction.OPEN); var filter = new Gtk.FileFilter (); filter.set_filter_name ("Database File"); filter.add_pattern ("*.db"); From ea05fa4d5ac268fd3ba28568cd57b68555338a35 Mon Sep 17 00:00:00 2001 From: welaq Date: Sun, 19 Aug 2018 02:53:47 +0300 Subject: [PATCH 13/13] Update lt.po (#143) --- po/lt.po | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9a8522fb..de7318cc 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-07-17 09:17-0700\n" -"PO-Revision-Date: 2018-06-12 11:12+0300\n" +"PO-Revision-Date: 2018-08-18 12:43+0300\n" "Last-Translator: Moo\n" "Language-Team: \n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 2.0.6\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" @@ -25,11 +25,11 @@ msgstr "Atsijungti" #: src/Layouts/HeaderBar.vala:53 msgid "Light background" -msgstr "" +msgstr "Šviesus fonas" #: src/Layouts/HeaderBar.vala:54 msgid "Dark background" -msgstr "" +msgstr "Tamsus fonas" #: src/Layouts/HeaderBar.vala:63 msgid "About" @@ -126,7 +126,7 @@ msgstr "Prisijunkite prie duomenų bazės ir įrašykite ją į savo biblioteką #: src/Layouts/Welcome.vala:39 msgid "Open a new Sequeler Window" -msgstr "" +msgstr "Atverkite naują Sequeler langą" #: src/Layouts/Welcome.vala:40 msgid "Import Connections" @@ -149,14 +149,12 @@ msgid "- Select Database -" msgstr "- Pasirinkite duomenų bazę -" #: src/Layouts/DataBaseSchema.vala:84 -#, fuzzy msgid "Search Tables" -msgstr "Pasirinkti lentelę" +msgstr "Ieškoti lentelėse" #: src/Layouts/DataBaseSchema.vala:95 -#, fuzzy msgid "Search Tables…" -msgstr "Pasirinkti lentelę" +msgstr "Ieškoti lentelėse…" #: src/Layouts/DataBaseSchema.vala:117 msgid "Reload Tables" @@ -172,20 +170,19 @@ msgstr "LENTELĖS" #: src/Layouts/DataBaseView.vala:45 msgid "Structure" -msgstr "" +msgstr "Struktūra" #: src/Layouts/DataBaseView.vala:46 msgid "Content" -msgstr "" +msgstr "Turinys" #: src/Layouts/DataBaseView.vala:47 msgid "Relations" -msgstr "" +msgstr "Sąsajos" #: src/Layouts/DataBaseView.vala:48 -#, fuzzy msgid "Query" -msgstr "Vykdyti užklausą" +msgstr "Užklausti" #: src/Layouts/Views/Structure.vala:67 src/Layouts/Views/Structure.vala:101 #: src/Layouts/Views/Content.vala:67 src/Layouts/Views/Content.vala:101