Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 69c8a0e3 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 c66de0a5
......@@ -79,6 +79,7 @@ Comment[nn]=Køyr inni konsoll
Comment[pl]=Uruchom wewnątrz konsoli
Comment[pt]=Executar no Konsole
Comment[pt_BR]=Executar no Konsole
Comment[ru]=Выполнить команду в Konsole
Comment[sk]=Spustiť v Konsole
Comment[sl]=Zaženi znotraj Konsole
Comment[sr]=Изврши у Конзоли
......
......@@ -294,6 +294,7 @@ Name[nn]=Opna ny fane
Name[pl]=Otwórz nową kartę
Name[pt]=Abrir uma Nova Página
Name[pt_BR]=Abre uma nova aba
Name[ru]=Открыть новую вкладку
Name[sk]=Otvoriť novú kartu
Name[sl]=Odpri nov zavihek
Name[sr]=Отвори нови језичак
......
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