Commit 364cca26 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 08f9556c
Pipeline #14618 passed with stage
in 6 minutes and 32 seconds
......@@ -14,6 +14,7 @@
"Name[fi]": "Vertaa ja yhdistä tiedostoja ja kansioita KDiff3:lla",
"Name[fr]": "Comparaison et fusion de fichiers ou de dossiers à l'aide de « KDiff3 »",
"Name[gl]": "Comparar ou mesturar ficheiros ou directorios con KDiff3",
"Name[ia]": "Compara/Fusiona Files/Directorios con KDiff3",
"Name[it]": "Confronta e fonde i file o le cartelle con KDiff3",
"Name[ko]": "KDiff3으로 파일과 디렉터리를 비교하거나 병합",
"Name[nl]": "Vergelijk/Voeg samen bestanden/mappen met KDiff3",
......
......@@ -19,6 +19,7 @@ Name[gl]=KDiff3Part
Name[hi]=के-डिफ3पार्ट
Name[hne]=के-डिफ3पार्ट
Name[hu]=KDiff3Part
Name[ia]=KDiff3Part
Name[it]=KDiff3Part
Name[ja]=KDiff3Part
Name[km]=KDiff3Part
......
......@@ -21,6 +21,7 @@ Name[hi]=के-डिफ3
Name[hne]=के-डिफ3
Name[hr]=KDiff3
Name[hu]=KDiff3
Name[ia]=KDiff3
Name[it]=KDiff3
Name[ja]=KDiff3
Name[km]=KDiff3
......@@ -71,6 +72,7 @@ GenericName[gl]=Interface para Diff e Patch
GenericName[hi]=डिफ/पैच फ्रन्टएण्ड
GenericName[hne]=डिफ/पैच फ्रन्टएन्ड
GenericName[hu]=Diff/Patch Frontend
GenericName[ia]=Fronte anterior de Diff/Patch
GenericName[it]=Interfaccia per i comandi diff e patch
GenericName[ja]=Diff/Patch フロントエンド
GenericName[km]=Diff/Patch ខាង​មុខ
......@@ -124,6 +126,7 @@ Comment[gl]=Unha ferramenta de comparación e fusión de ficheiros e directorios
Comment[hi]=फ़ाइल तथा डिरेक्ट्री तुलना करने व मिलाने का औजार
Comment[hne]=फाइल अउ डिरेक्टरी तुलना करे अउ मिलाय के औजार
Comment[hu]=Egy fájl és könyvtár összehasonlítási és egyesítési eszköz
Comment[ia]=Un instrumento de fusion e comparation de file e directorio
Comment[it]=Uno strumento di confronto e fusione di file e cartelle
Comment[ja]=ファイルやディレクトリの比較/マージを行うツール
Comment[km]=ការ​ប្រៀបធៀប​ថត និង​ឯកសារ និង​ឧបករណ៌​បញ្ចូល​គ្នា
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment