← Back to branch summary

~neon/kompare/master

« back to all changes in this revision

Viewing changes to src/komparenavtreepart/komparenavtreepart.json.in

  • Committer: l10n daemon script
  • Date: 2023-11-04 11:59:28 UTC
  • Revision ID: git-v1:f38f3b927db680937c57e7174e095c2a3299b0e5
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"

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/komparenavtreepart/komparenavtreepart.json.in
29
29
                "Name[ta]": "ஜான் ஃபயர்பாக்",
30
30
                "Name[tr]": "John Firebaugh",
31
31
                "Name[uk]": "John Firebaugh",
32
 
                "Name[x-test]": "xxJohn Firebaughxx",
33
32
                "Name[zh_CN]": "John Firebaugh",
34
33
                "Name[zh_TW]": "John Firebaugh"
35
34
            },
61
60
                "Name[ta]": "ஓட்டோ புருகமான்",
62
61
                "Name[tr]": "Otto Bruggeman",
63
62
                "Name[uk]": "Otto Bruggeman",
64
 
                "Name[x-test]": "xxOtto Bruggemanxx",
65
63
                "Name[zh_CN]": "Otto Bruggeman",
66
64
                "Name[zh_TW]": "Otto Bruggeman"
67
65
            },
93
91
                "Name[ta]": "கெவின் கொஃப்லர்",
94
92
                "Name[tr]": "Kevin Kofler",
95
93
                "Name[uk]": "Kevin Kofler",
96
 
                "Name[x-test]": "xxKevin Koflerxx",
97
94
                "Name[zh_CN]": "Kevin Kofler",
98
95
                "Name[zh_TW]": "Kevin Kofler"
99
96
            }
162
159
        "Name[tr]": "KompareNavTreePart",
163
160
        "Name[ug]": "KompareNavTreePart",
164
161
        "Name[uk]": "KompareNavTreePart",
165
 
        "Name[x-test]": "xxKompareNavTreePartxx",
166
162
        "Name[xh]": "KompareNavTreePart",
167
163
        "Name[zh_CN]": "KompareNavTreePart",
168
164
        "Name[zh_TW]": "KompareNavTreePart",