GitHub/vienna-rss
1
0
Fork 0
mirror of https://github.com/ViennaRSS/vienna-rss.git synced 2026-04-07 19:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort Predicate.strings files when combined

Browse Source 
Whenever these files are expanded and combined, the order is not consistent. This causes needless git diffs.
This commit is contained in:
Eitot
2024-07-20 13:19:39 +02:00
parent 63328a5717
commit 1252a1d56c
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Packages/ProcessPredicateLocalizations/Sources/ProcessPredicateLocalizations/main.swift
+1 -1
View File
@@ -210,7 +210,7 @@ func render(_ combinedTranslations: [Int : [TranslationWithOptions]]) throws ->
combinedTranslationStrings.append("\"\(combined.original)\" = \"\(combined.translation)\";")
}
}
return combinedTranslationStrings
return combinedTranslationStrings.sorted()
}
let groupedByNumOptions = try parseAndExpand(fileName: stringsFileName)
Vienna/Resources/Base.lproj/Predicates.strings
+3 -3
View File
@@ -1,8 +1,8 @@
"%[All,Any,None]@ of the following are true" = "Article matches %1$[all,any,none]@ of the following conditions";
"%[Author,Subject,Text]@ %[contains,does not contain]@ %@" = "%1$[Author,Subject,Content]@ %2$[contains,does not contain]@ %3$@";
"%[Deleted,Flagged,HasEnclosure,Read]@ is %[No,Yes]@" = "%1$[Is deleted,Is flagged,Has enclosure,Is read]@ %2$[No,Yes]@";
"%[Author,Folder,Subject,Text]@ %[is,is not]@ %@" = "%1$[Author,Folder,Subject,Content]@ %2$[is,is not]@ %3$@";
"%[Author,Subject,Text]@ %[contains,does not contain]@ %@" = "%1$[Author,Subject,Content]@ %2$[contains,does not contain]@ %3$@";
"%[Date]@ %[is,is greater than or equal to,is less than,is less than or equal to]@ %[yesterday]@" = "%1$[Date]@ %2$[is,is after or is,is before,is before or is]@ %3$[yesterday]@";
"%[Date]@ %[less than ago,more than ago]@ %[days,hours,minutes,months,weeks,years]@ %@" = "%1$[Date]@ %2$[is in the last,is not in the last]@ %4$@ %3$[days,hours,minutes,months,weeks,years]@";
"%[Date]@ %[is,is greater than,is greater than or equal to,is less than,is less than or equal to]@ %[last week]@" = "%1$[Date]@ %2$[is,is after,is after or is,is before,is before or is]@ %3$[last week]@";
"%[Date]@ %[is,is less than,is less than or equal to]@ %[today]@" = "%1$[Date]@ %2$[is,is before,is before or is]@ %3$[today]@";
"%[Date]@ %[less than ago,more than ago]@ %[days,hours,minutes,months,weeks,years]@ %@" = "%1$[Date]@ %2$[is in the last,is not in the last]@ %4$@ %3$[days,hours,minutes,months,weeks,years]@";
"%[Deleted,Flagged,HasEnclosure,Read]@ is %[No,Yes]@" = "%1$[Is deleted,Is flagged,Has enclosure,Is read]@ %2$[No,Yes]@";
Vienna/Resources/de.lproj/Predicates.strings
+5 -5
View File
@@ -1,8 +1,8 @@
"%[Author,Subject,Text]@ %[contains,does not contain]@ %@" = "%1$[Autor,Betreff,Inhalt]@ %2$[enthält,enthält nicht]@ %3$@";
"%[All,Any,None]@ of the following are true" = "Artikel erfüllt %1$[alle,beliebige,keine]@ der folgenden Bedingungen";
"%[Author,Folder,Subject,Text]@ %[is,is not]@ %@" = "%1$[Autor,Feed oder Ordner,Betreff,Inhalt]@ %2$[ist,ist nicht]@ %3$@";
"%[Deleted,Flagged,HasEnclosure,Read]@ is %[No,Yes]@" = "%1$[Ist gelöscht,Ist markiert,Hat Anhang,Ist gelesen]@ %2$[Nein,Ja]@";
"%[Author,Subject,Text]@ %[contains,does not contain]@ %@" = "%1$[Autor,Betreff,Inhalt]@ %2$[enthält,enthält nicht]@ %3$@";
"%[Date]@ %[is,is greater than or equal to,is less than,is less than or equal to]@ %[yesterday]@" = "%1$[Datum]@ %2$[ist,ist nach oder ist,ist vor,ist vor oder ist]@ %3$[gestern]@";
"%[Date]@ %[is,is greater than,is greater than or equal to,is less than,is less than or equal to]@ %[last week]@" = "%1$[Datum]@ %2$[ist,ist nach,ist nach oder ist,ist vor,ist vor oder ist]@ %3$[letzte Woche]@";
"%[Date]@ %[is,is less than,is less than or equal to]@ %[today]@" = "%1$[Datum]@ %2$[ist,ist vor,ist vor oder ist]@ %3$[heute]@";
"%[Date]@ %[less than ago,more than ago]@ %[days,hours,minutes,months,weeks,years]@ %@" = "%1$[Datum]@ %2$[ist innerhalb der letzten,ist nicht innerhalb der letzten]@ %4$@ %3$[Tage,Stunden,Minuten,Monate,Wochen,Jahre]@";
"%[Date]@ %[is,is greater than,is greater than or equal to,is less than,is less than or equal to]@ %[last week]@" = "%1$[Datum]@ %2$[ist,ist nach,ist nach oder ist,ist vor,ist vor oder ist]@ %3$[letzte Woche]@";
"%[Date]@ %[is,is greater than or equal to,is less than,is less than or equal to]@ %[yesterday]@" = "%1$[Datum]@ %2$[ist,ist nach oder ist,ist vor,ist vor oder ist]@ %3$[gestern]@";
"%[All,Any,None]@ of the following are true" = "Artikel erfüllt %1$[alle,beliebige,keine]@ der folgenden Bedingungen";
"%[Deleted,Flagged,HasEnclosure,Read]@ is %[No,Yes]@" = "%1$[Ist gelöscht,Ist markiert,Hat Anhang,Ist gelesen]@ %2$[Nein,Ja]@";
Vienna/Resources/fr.lproj/Predicates.strings
+7 -7
View File
@@ -1,9 +1,9 @@
"%[Date]@ %[is,is greater than,is greater than or equal to,is less than,is less than or equal to]@ %[last week]@" = "%1$[Date]@ %2$[est durant,est durant ou après,est dans ou après,est avant,est avant ou durant]@ %3$[la dernière semaine]@";
"%[Date]@ %[less than ago,more than ago]@ %[days,hours,minutes,months,weeks,years]@ %@" = "%1$[Date]@ %2$[est dans les,n'est pas dans les]@ %4$@ %3$[derniers jours,dernières heures,dernières minutes,derniers mois,dernières semaines,dernières années]@";
"%[Date]@ %[is,is less than,is less than or equal to]@ %[today]@" = "%1$[Date]@ %2$[est,est avant,est avant ou durant]@ %3$[aujourd'hui]@";
"%[Date]@ %[is,is greater than or equal to,is less than,is less than or equal to]@ %[yesterday]@" = "%1$[Date]@ %2$[est,est durant ou après,est avant,est avant ou durant]@ %3$[hier]@";
"%[All,Any]@ of the following are true" = "L'article satisfait %1$[toutes les,une des]@ conditions suivantes";
"%[None]@ of the following are true" = "L'article satisfait %1$[aucune]@ des conditions suivantes";
"%[Deleted,Flagged,HasEnclosure,Read]@ is %[No,Yes]@" = "%1$[Effacé,Signalé,Fichier joint,Lu]@ %2$[Non,Oui]@";
"%[Author,Subject,Text]@ %[contains,does not contain]@ %@" = "%1$[Auteur,Sujet,Texte]@ %2$[contient,ne contient pas]@ %3$@";
"%[Author,Folder,Subject,Text]@ %[is,is not]@ %@" = "%1$[Auteur,Dossier,Sujet,Texte]@ %2$[est,n'est pas]@ %3$@";
"%[Author,Subject,Text]@ %[contains,does not contain]@ %@" = "%1$[Auteur,Sujet,Texte]@ %2$[contient,ne contient pas]@ %3$@";
"%[Date]@ %[is,is greater than or equal to,is less than,is less than or equal to]@ %[yesterday]@" = "%1$[Date]@ %2$[est,est durant ou après,est avant,est avant ou durant]@ %3$[hier]@";
"%[Date]@ %[is,is greater than,is greater than or equal to,is less than,is less than or equal to]@ %[last week]@" = "%1$[Date]@ %2$[est durant,est durant ou après,est dans ou après,est avant,est avant ou durant]@ %3$[la dernière semaine]@";
"%[Date]@ %[is,is less than,is less than or equal to]@ %[today]@" = "%1$[Date]@ %2$[est,est avant,est avant ou durant]@ %3$[aujourd'hui]@";
"%[Date]@ %[less than ago,more than ago]@ %[days,hours,minutes,months,weeks,years]@ %@" = "%1$[Date]@ %2$[est dans les,n'est pas dans les]@ %4$@ %3$[derniers jours,dernières heures,dernières minutes,derniers mois,dernières semaines,dernières années]@";
"%[Deleted,Flagged,HasEnclosure,Read]@ is %[No,Yes]@" = "%1$[Effacé,Signalé,Fichier joint,Lu]@ %2$[Non,Oui]@";
"%[None]@ of the following are true" = "L'article satisfait %1$[aucune]@ des conditions suivantes";
Vienna/Resources/nl.lproj/Predicates.strings
+7 -7
View File
@@ -1,8 +1,8 @@
"%[Author,Folder,Subject,Text]@ %[is,is not]@ %@" = "%1$[Auteur,Feed of map,Onderwerp,Inhoud]@ %2$[is,is niet]@ %3$@";
"%[Deleted,Flagged,HasEnclosure,Read]@ is %[No,Yes]@" = "%1$[Is verwijderd,Is gemarkeerd,Bevat bijlage,Is gelezen]@ %2$[Nee,Ja]@";
"%[Author,Subject,Text]@ %[contains,does not contain]@ %@" = "%1$[Auteur,Onderwerp,Inhoud]@ %2$[bevat,bevat niet]@ %3$@";
"%[Date]@ %[less than ago,more than ago]@ %[days,hours,minutes,months,weeks,years]@ %@" = "%1$[Datum]@ %2$[is in de afgelopen,is niet in de afgelopen]@ %4$@ %3$[dagen,uur,minuten,maanden,weken,jaar]@";
"%[Date]@ %[is,is greater than or equal to,is less than,is less than or equal to]@ %[yesterday]@" = "%1$[Datum]@ %2$[is na,is na of is,is voor,is voor of is]@ %3$[gisteren]@";
"%[Date]@ %[is,is less than,is less than or equal to]@ %[today]@" = "%1$[Datum]@ %2$[is na,is voor,is voor of is]@ %3$[vandaag]@";
"%[Date]@ %[is,is greater than,is greater than or equal to,is less than,is less than or equal to]@ %[last week]@" = "%1$[Datum]@ %2$[is,is na,is na of is,is voor,is voor of is]@ %3$[vorige week]@";
"%[All,Any,None]@ of the following are true" = "Artikel voldoet aan %1$[alle,een of meer,geen]@ van de volgende voorwaarden";
"%[Author,Folder,Subject,Text]@ %[is,is not]@ %@" = "%1$[Auteur,Feed of map,Onderwerp,Inhoud]@ %2$[is,is niet]@ %3$@";
"%[Author,Subject,Text]@ %[contains,does not contain]@ %@" = "%1$[Auteur,Onderwerp,Inhoud]@ %2$[bevat,bevat niet]@ %3$@";
"%[Date]@ %[is,is greater than or equal to,is less than,is less than or equal to]@ %[yesterday]@" = "%1$[Datum]@ %2$[is na,is na of is,is voor,is voor of is]@ %3$[gisteren]@";
"%[Date]@ %[is,is greater than,is greater than or equal to,is less than,is less than or equal to]@ %[last week]@" = "%1$[Datum]@ %2$[is,is na,is na of is,is voor,is voor of is]@ %3$[vorige week]@";
"%[Date]@ %[is,is less than,is less than or equal to]@ %[today]@" = "%1$[Datum]@ %2$[is na,is voor,is voor of is]@ %3$[vandaag]@";
"%[Date]@ %[less than ago,more than ago]@ %[days,hours,minutes,months,weeks,years]@ %@" = "%1$[Datum]@ %2$[is in de afgelopen,is niet in de afgelopen]@ %4$@ %3$[dagen,uur,minuten,maanden,weken,jaar]@";
"%[Deleted,Flagged,HasEnclosure,Read]@ is %[No,Yes]@" = "%1$[Is verwijderd,Is gemarkeerd,Bevat bijlage,Is gelezen]@ %2$[Nee,Ja]@";
Vienna/Resources/sv.lproj/Predicates.strings
+6 -6
View File
@@ -1,9 +1,9 @@
"%[Date]@ %[is,is greater than or equal to,is less than,is less than or equal to]@ %[yesterday]@" = "%1$[Datum]@ %2$[är,är efter eller,är före,är före eller]@ %3$[igår]@";
"%[Date]@ %[less than ago,more than ago]@ %[days,hours,minutes,months,weeks,years]@ %@" = "%1$[Datum]@ %2$[är de senaste,är inte de senaste]@ %4$@ %3$[dagarna,timmarna,minuterna,månaderna,veckorna,åren]@";
"%[Date]@ %[is,is less than,is less than or equal to]@ %[today]@" = "%1$[Datum]@ %2$[är,är före,är före eller]@ %3$[idag]@";
"%[Date]@ %[is,is greater than,is greater than or equal to,is less than,is less than or equal to]@ %[last week]@" = "%1$[Datum]@ %2$[är,är efter,är efter eller,är före,är före eller]@ %3$[förra veckan]@";
"%[All]@ of the following are true" = "Artikel matchar %1$[alla]@ följande villkor";
"%[Any,None]@ of the following are true" = "Artikeln matchar %1$[någon,ingen]@ av följande villkor";
"%[Author,Folder,Subject,Text]@ %[is,is not]@ %@" = "%1$[Författare,Mapp,Ämne,Innehåll]@ %2$[är,är inte]@ %3$@";
"%[Author,Subject,Text]@ %[contains,does not contain]@ %@" = "%1$[Författare,Ämne,Innehåll]@ %2$[innehåller,innehåller inte]@ %3$@";
"%[Date]@ %[is,is greater than or equal to,is less than,is less than or equal to]@ %[yesterday]@" = "%1$[Datum]@ %2$[är,är efter eller,är före,är före eller]@ %3$[igår]@";
"%[Date]@ %[is,is greater than,is greater than or equal to,is less than,is less than or equal to]@ %[last week]@" = "%1$[Datum]@ %2$[är,är efter,är efter eller,är före,är före eller]@ %3$[förra veckan]@";
"%[Date]@ %[is,is less than,is less than or equal to]@ %[today]@" = "%1$[Datum]@ %2$[är,är före,är före eller]@ %3$[idag]@";
"%[Date]@ %[less than ago,more than ago]@ %[days,hours,minutes,months,weeks,years]@ %@" = "%1$[Datum]@ %2$[är de senaste,är inte de senaste]@ %4$@ %3$[dagarna,timmarna,minuterna,månaderna,veckorna,åren]@";
"%[Deleted,Flagged,HasEnclosure,Read]@ is %[No,Yes]@" = "%1$[Är raderad,Är flaggad,Har bilaga,Är läst]@ %2$[Nej,Ja]@";
"%[Any,None]@ of the following are true" = "Artikeln matchar %1$[någon,ingen]@ av följande villkor";
"%[All]@ of the following are true" = "Artikel matchar %1$[alla]@ följande villkor";