From eb01063bfb2d499385c8d4a73a07b8fc4b6403ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Sun, 7 Jan 2024 02:48:26 +0300 Subject: [PATCH 1/5] appdata: Update appdata - Add vcs-browser and translate URLs - Add the translation tag - Mark the developer name and release descriptions as untranslatable - Use appstreamcli to validate appdata - Remove redundant paragraph from the translation document --- ....github.mightycreak.Diffuse.appdata.xml.in | 32 ++++++++++--------- docs/translators.md | 6 ---- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/data/io.github.mightycreak.Diffuse.appdata.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in index f336188..886a0e3 100644 --- a/data/io.github.mightycreak.Diffuse.appdata.xml.in +++ b/data/io.github.mightycreak.Diffuse.appdata.xml.in @@ -19,8 +19,11 @@ GPL-2.0-or-later io.github.mightycreak.Diffuse.desktop + diffuse https://mightycreak.github.io/diffuse/ https://github.com/MightyCreak/diffuse/issues + https://github.com/MightyCreak/diffuse + https://github.com/MightyCreak/diffuse/blob/main/docs/translators.md @@ -33,13 +36,12 @@ - - Romain Failliot + Romain Failliot romain@foolstep.com - +

Use more modern, symbolic icons, add Dutch translation, and a couple of small fixes.

Added:

    @@ -62,7 +64,7 @@ - +

    Fix for the shortcuts that weren't working anymore due to migration to Gtk.Application.

    @@ -82,7 +84,7 @@     - +

    Update to GNOME 44, improved GTK 3 support, initial support for Rust, added Turkish and Georgian translations, and a couple of fixes. @@ -119,7 +121,7 @@ - +

    Update translations.

    @@ -132,7 +134,7 @@     - +

    Add port to Mac OS.

    @@ -153,7 +155,7 @@     - +

    Crashfix and French translation.

    @@ -170,7 +172,7 @@     - +

    Mainly a maintenance release. It does increase the GNOME SDK's version.

    @@ -204,7 +206,7 @@     - +

    Patch release that introduces linters (flake8 and mypy).

    @@ -229,7 +231,7 @@     - +

    Patch release that fixes an error about APP_NAME and the Brazilian translation.

    @@ -257,7 +259,7 @@     - +

    Patch release to fix a bug when using the Flatpak package.

    @@ -271,7 +273,7 @@     - +

    With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder @@ -310,7 +312,7 @@ - +

    Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a @@ -335,7 +337,7 @@ - +

    Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release! diff --git a/docs/translators.md b/docs/translators.md index ec3e222..78385c8 100644 --- a/docs/translators.md +++ b/docs/translators.md @@ -17,12 +17,6 @@ repo root: xgettext -w 84 -o po/diffuse.pot -f po/POTFILES ``` -Regenerating the POT file will add a bunch of new lines coming from -`data/io.github.mightycreak.Diffuse.appdata.xml.in`. Not all the lines need to -be translated in this file. In `diffuse.pot`, look for the comment -`Translators: no need to translate after this comment`, and remove all the -added lines for this file. - _Note:_ why 84 characters, you ask? because the usage text has to be 80-char wide, plus the beginning and ending `"` and the final `\n` (which is two characters). From b24958d68cab7169e5d3c6d821634043c00a24dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Sun, 7 Jan 2024 02:50:58 +0300 Subject: [PATCH 2/5] Update Turkish translation --- po/tr.po | 145 +++++++++++++------------------------------------------ 1 file changed, 34 insertions(+), 111 deletions(-) diff --git a/po/tr.po b/po/tr.po index 0bef73b..342b208 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,23 +1,23 @@ # Turkish translation for io.github.mightycreak.Diffuse. -# Copyright (C) 2022 io.github.mightycreak.Diffuse's COPYRIGHT HOLDER +# Copyright (C) 2022-2024 io.github.mightycreak.Diffuse's COPYRIGHT HOLDER # This file is distributed under the same license as the io.github.mightycreak.Diffuse package. # -# Sabri Ünal , 2022. +# Sabri Ünal , 2022, 2024. # msgid "" msgstr "" "Project-Id-Version: io.github.mightycreak.Diffuse\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-04-16 14:09-0400\n" -"PO-Revision-Date: 2022-11-19 03:14+0300\n" +"PO-Revision-Date: 2024-01-07 02:49+0300\n" "Last-Translator: Sabri Ünal \n" -"Language-Team: Türkçe \n" +"Language-Team: Türkçe \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.4.2\n" #: data/io.github.mightycreak.Diffuse.desktop.in:3 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:4 @@ -30,23 +30,22 @@ msgid "Graphical tool for merging and comparing text files" msgstr "Metin dosyalarını birleştirmek ve karşılaştırmak için grafiksel araç" #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7 -#, fuzzy msgid "" "Diffuse is a graphical tool for comparing and merging text files. It can retrieve " "files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and " "Subversion repositories." msgstr "" "Diffuse, metin dosyalarını karşılaştırmak ve birleştirmek için grafiksel bir " -"araçtır. Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, ve Subversion " -"depolarından karşılaştırma için dosyaları alabilir." +"araçtır. Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS ve Subversion " +"depolarından karşılaştırma için dosya alabilir." #: data/io.github.mightycreak.Diffuse.appdata.xml.in:28 msgid "Main window" -msgstr "" +msgstr "Ana pencere" #: data/io.github.mightycreak.Diffuse.appdata.xml.in:32 msgid "About window" -msgstr "" +msgstr "Pencere hakkında" #: src/diffuse/constants.py:26 msgid "Copyright" @@ -56,7 +55,7 @@ msgstr "Telif Hakkı" #: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483 #: src/diffuse/window.py:309 src/diffuse/window.py:1107 msgid "_Cancel" -msgstr "" +msgstr "İ_ptal" #: src/diffuse/dialogs.py:50 msgid "Encoding: " @@ -69,7 +68,7 @@ msgstr "Düzeltme: " #: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134 #: src/diffuse/preferences.py:255 msgid "_OK" -msgstr "" +msgstr "_Tamam" #: src/diffuse/dialogs.py:130 msgid "Find..." @@ -104,9 +103,8 @@ msgid "File revisions and " msgstr "Dosya düzeltmesi ve " #: src/diffuse/main.py:85 -#, fuzzy msgid "Close all tabs with no differences" -msgstr "Fark yoksa sekmeleri kapat" +msgstr "Fark olmayan tüm sekmeleri kapat" #: src/diffuse/main.py:92 msgid "Use to read and write files" @@ -172,6 +170,11 @@ msgid "" "ability to manually adjust line matching and directly edit files. Diffuse can\n" "also retrieve revisions of files from several VCSs for comparison and merging." msgstr "" +"Diffuse, metin dosyalarını karşılaştırmak ve birleştirmek için grafiksel bir " +"araçtır. Diffuse, pek çok dosyayı yan yana karşılaştırabilir ve kullanıcılara " +"satır eşleştirmeyi elle ayarlama ve dosyaları doğrudan düzenleme imkanı sunar. " +"Diffuse ayrıca karşılaştırma ve birleştirme için çeşitli sürüm kontrol " +"sistemlerinden dosyaların revizyonlarını alabilir." #: src/diffuse/main.py:247 src/diffuse/window.py:420 #, python-format @@ -332,7 +335,7 @@ msgstr "%s yazma hatası." #: src/diffuse/preferences.py:483 src/diffuse/window.py:446 #: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459 msgid "_Open" -msgstr "" +msgstr "_Aç" #: src/diffuse/resources.py:242 src/diffuse/resources.py:246 #: src/diffuse/resources.py:249 @@ -491,11 +494,11 @@ msgstr "Yeni dosya yüklenmeden önce değişiklikler kaydedilsin mi?" #: src/diffuse/window.py:310 msgid "_No" -msgstr "" +msgstr "_Hayır" #: src/diffuse/window.py:311 msgid "_Yes" -msgstr "" +msgstr "_Evet" #: src/diffuse/window.py:417 #, python-format @@ -512,9 +515,8 @@ msgid "Save %(title)s Pane %(pane)d" msgstr "%(title)s Bölmesi %(pane)d Kaydet" #: src/diffuse/window.py:499 src/diffuse/window.py:1111 -#, fuzzy msgid "_Save" -msgstr "Dosyayı _Kaydet" +msgstr "_Kaydet" #: src/diffuse/window.py:527 #, python-format @@ -894,24 +896,32 @@ msgstr "Yinele" #: src/diffuse/window.py:950 msgid "Changes detected" -msgstr "" +msgstr "Değişiklikler algılandı" #: src/diffuse/window.py:954 -#, fuzzy, python-format +#, python-format msgid "" "The file \"%s\" changed on disk.\n" "\n" "Do you want to reload the file?" -msgstr "%s dosyası diskte değişti. Dosyayı yeniden yüklemek ister misiniz?" +msgstr "" +"\"%s\" dosyası diskte değişti. \n" +"\n" +"Dosyayı yeniden yüklemek ister misiniz?" #: src/diffuse/window.py:959 -#, fuzzy, python-format +#, python-format msgid "" "The following files changed on disk:\n" "%s\n" "\n" "Do you want to reload these files?" -msgstr "%s dosyası diskte değişti. Dosyayı yeniden yüklemek ister misiniz?" +msgstr "" +"Aşağıdaki dosyalar diskte değişti. \n" +"\n" +"%s\n" +"\n" +"Bu dosyaları yeniden yüklemek ister misiniz?" #: src/diffuse/window.py:1078 msgid "Some files have unsaved changes. Select the files to save before closing." @@ -996,90 +1006,3 @@ msgstr "" #: src/diffuse/window.py:1766 msgid "translator-credits" msgstr "Sabri Ünal " - -#~ msgid "Main window: diff between two files" -#~ msgstr "Ana pencere: iki dosya arasında fark" - -#~ msgid "" -#~ "Usage:\n" -#~ " diffuse [OPTION...] [FILE...]\n" -#~ " diffuse ( -h | -? | --help | -v | --version )\n" -#~ "\n" -#~ "Diffuse is a graphical tool for merging and comparing text files. Diffuse is\n" -#~ "able to compare an arbitrary number of files side-by-side and gives users the\n" -#~ "ability to manually adjust line matching and directly edit files. Diffuse can\n" -#~ "also retrieve revisions of files from several VCSs for comparison and " -#~ "merging.\n" -#~ "\n" -#~ "Help Options:\n" -#~ " ( -h | -? | --help ) Display this usage information\n" -#~ " ( -v | --version ) Display version and copyright information\n" -#~ "\n" -#~ "Configuration Options:\n" -#~ " --no-rcfile Do not read any resource files\n" -#~ " --rcfile Specify explicit resource file\n" -#~ "\n" -#~ "General Options:\n" -#~ " ( -c | --commit ) File revisions and \n" -#~ " ( -D | --close-if-same ) Close all tabs with no differences\n" -#~ " ( -e | --encoding ) Use to read and write files\n" -#~ " ( -L | --label )